mirror of
https://github.com/JonasunderscoreJones/ZtereoMUSIC.git
synced 2025-10-25 13:39:19 +02:00
fix: skip useless check and issue where the bot would fail skipping
This commit is contained in:
parent
39efb6b4ee
commit
3ddcef749b
1 changed files with 6 additions and 7 deletions
|
|
@ -5,12 +5,10 @@ import codes.ztereohype.ztereomusic.audio.TrackManagers;
|
||||||
import codes.ztereohype.ztereomusic.command.Command;
|
import codes.ztereohype.ztereomusic.command.Command;
|
||||||
import codes.ztereohype.ztereomusic.command.CommandMeta;
|
import codes.ztereohype.ztereomusic.command.CommandMeta;
|
||||||
import codes.ztereohype.ztereomusic.command.permissions.VoiceChecks;
|
import codes.ztereohype.ztereomusic.command.permissions.VoiceChecks;
|
||||||
|
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
|
||||||
import net.dv8tion.jda.api.entities.Guild;
|
import net.dv8tion.jda.api.entities.Guild;
|
||||||
import net.dv8tion.jda.api.entities.Member;
|
|
||||||
import net.dv8tion.jda.api.entities.MessageChannel;
|
import net.dv8tion.jda.api.entities.MessageChannel;
|
||||||
import net.dv8tion.jda.api.entities.VoiceChannel;
|
|
||||||
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
|
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
|
||||||
import net.dv8tion.jda.api.managers.AudioManager;
|
|
||||||
|
|
||||||
public class Skip implements Command {
|
public class Skip implements Command {
|
||||||
private final CommandMeta meta;
|
private final CommandMeta meta;
|
||||||
|
|
@ -38,13 +36,14 @@ public class Skip implements Command {
|
||||||
Guild guild = messageEvent.getGuild();
|
Guild guild = messageEvent.getGuild();
|
||||||
MessageChannel messageChannel = messageEvent.getChannel();
|
MessageChannel messageChannel = messageEvent.getChannel();
|
||||||
TrackManager trackManager = TrackManagers.getGuildTrackManager(guild, messageChannel);
|
TrackManager trackManager = TrackManagers.getGuildTrackManager(guild, messageChannel);
|
||||||
|
|
||||||
assert trackManager != null; // the command will not execute if it is anyway because of our VoiceChecks (BOT_PLAYING)
|
assert trackManager != null; // the command will not execute if it is anyway because of our VoiceChecks (BOT_PLAYING)
|
||||||
if (trackManager.getPlayer().getPlayingTrack() == null) {
|
AudioPlayer player = trackManager.getPlayer();
|
||||||
messageChannel.sendMessage("I am not even playing anything!").queue();
|
|
||||||
return;
|
if (player.getPlayingTrack() != null) {
|
||||||
|
player.stopTrack();
|
||||||
}
|
}
|
||||||
|
|
||||||
trackManager.skip();
|
trackManager.skip();
|
||||||
|
messageChannel.sendMessage("Skipping...").queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue