Clean up voice channel effect send

discord-jda · Nov 4, 2024 · f9245b4 · f9245b4
1 parent 78994a1
commit f9245b4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/concrete/VoiceChannel.java b/src/main/java/net/dv8tion/jda/api/entities/channel/concrete/VoiceChannel.java
@@ -73,5 +73,4 @@ default ChannelAction<VoiceChannel> createCopy()
     @Override
     @CheckReturnValue
     VoiceChannelManager getManager();
-
 }
diff --git a/src/main/java/net/dv8tion/jda/api/events/channel/VoiceChannelEffectSendEvent.java b/src/main/java/net/dv8tion/jda/api/events/channel/VoiceChannelEffectSendEvent.java
@@ -17,7 +17,6 @@
 package net.dv8tion.jda.api.events.channel;
 
 import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.VoiceChannelEffect;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.api.requests.GatewayIntent;
@@ -34,16 +33,16 @@ public class VoiceChannelEffectSendEvent extends GenericChannelEvent
 {
     private final VoiceChannelEffect effect;
 
-    public VoiceChannelEffectSendEvent(@Nonnull JDA api, long responseNumber, Channel channel, VoiceChannelEffect effect)
+    public VoiceChannelEffectSendEvent(@Nonnull JDA api, long responseNumber, VoiceChannelEffect effect)
     {
-        super(api, responseNumber, channel);
+        super(api, responseNumber, effect.getChannel());
         this.effect = effect;
     }
 
     @Nonnull
     public VoiceChannel getVoiceChannel()
     {
-        return getChannel().asVoiceChannel();
+        return effect.getChannel();
     }
 
     @Nonnull

diff --git a/src/main/java/net/dv8tion/jda/internal/handle/VoiceChannelEffectSendHandler.java b/src/main/java/net/dv8tion/jda/internal/handle/VoiceChannelEffectSendHandler.java
@@ -72,7 +72,7 @@ protected Long handleInternally(DataObject content)
 
         VoiceChannelEffect effect = new VoiceChannelEffect(channel, user, emoji, animation, soundboardSound);
 
-        api.handleEvent(new VoiceChannelEffectSendEvent(api, responseNumber, channel, effect));
+        api.handleEvent(new VoiceChannelEffectSendEvent(api, responseNumber, effect));
 
         return null;
     }