From 08e18bab64c94a68d9a1327f03232a01d7fa951c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 18 Jan 2020 17:02:34 +0100 Subject: [PATCH 1/3] Remove unused import --- src/main/java/com/bbn/hadder/Hadder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 2dd1812..917328f 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -16,7 +16,6 @@ import net.dv8tion.jda.api.entities.Activity; import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder; import net.dv8tion.jda.api.sharding.ShardManager; -import javax.security.auth.login.LoginException; import java.util.List; public class Hadder { From b9767b0839347d83d71762e00383504241ad33ab Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 19 Jan 2020 11:32:53 +0100 Subject: [PATCH 2/3] Music fix lol --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index 5154b80..08a1363 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -48,13 +48,13 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { + Guild g = queue.poll().getAuthor().getGuild(); if (loop) { player.playTrack(track.makeClone()); } else if (queue.isEmpty()) { - Guild g = queue.poll().getAuthor().getGuild(); g.getAudioManager().closeAudioConnection(); } else { - player.playTrack(queue.element().getTrack().makeClone()); + player.playTrack(queue.element().getTrack()); } } From 6ef8fdfd9b81979faea79d1fc8ca187baecd76aa Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 19 Jan 2020 11:47:11 +0100 Subject: [PATCH 3/3] #328 --- src/main/java/com/bbn/hadder/audio/AudioManager.java | 2 +- src/main/java/com/bbn/hadder/audio/TrackManager.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java index 4e7b730..c40002a 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioManager.java +++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java @@ -53,7 +53,7 @@ public class AudioManager { public AudioPlayer createPlayer(Guild guild) { AudioPlayer nPlayer = myManager.createPlayer(); - TrackManager manager = new TrackManager(nPlayer); + TrackManager manager = new TrackManager(nPlayer, this); nPlayer.addListener(manager); guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(nPlayer)); players.put(guild.getId(), new AbstractMap.SimpleEntry<>(nPlayer, manager)); diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index 08a1363..c5710fe 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -18,10 +18,12 @@ import java.util.concurrent.LinkedBlockingQueue; public class TrackManager extends AudioEventAdapter { private final AudioPlayer player; + private final AudioManager manager; private final Queue queue; private boolean loop = false; - public TrackManager(AudioPlayer player) { + public TrackManager(AudioPlayer player, AudioManager manager) { + this.manager = manager; this.player = player; this.queue = new LinkedBlockingQueue<>(); } @@ -52,6 +54,9 @@ public class TrackManager extends AudioEventAdapter { if (loop) { player.playTrack(track.makeClone()); } else if (queue.isEmpty()) { + manager.players.remove(g.getId()); + manager.getPlayer(g).destroy(); + manager.getTrackManager(g).purgeQueue(); g.getAudioManager().closeAudioConnection(); } else { player.playTrack(queue.element().getTrack());