greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

v1.1.0 #378

Merged
greg6775 merged 32 commits from greg-dev into master 2020-02-20 21:02:19 +01:00
Conversation 0 Commits 32 Files changed 31 +10 -8
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0b281a20ac - Show all commits

12
src/main/java/com/bbn/hadder/audio/TrackManager.java
View file

@ -63,17 +63,19 @@ public class TrackManager extends AudioEventAdapter {
@Override @Override
public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
Guild g = queue.poll().getAuthor().getGuild();
this.lastTrack = track;
if (loop) { if (loop) {
this.lastTrack = track;
player.playTrack(lastTrack.makeClone()); player.playTrack(lastTrack.makeClone());
} else if (queue.isEmpty()) { } else {
Guild g = queue.poll().getAuthor().getGuild();
manager.getPlayer(g).stopTrack();
if (!queue.isEmpty()) player.playTrack(queue.element().getTrack().makeClone());
else {
manager.players.remove(g.getId()); manager.players.remove(g.getId());
manager.getPlayer(g).destroy(); manager.getPlayer(g).destroy();
manager.getTrackManager(g).purgeQueue(); manager.getTrackManager(g).purgeQueue();
g.getAudioManager().closeAudioConnection(); g.getAudioManager().closeAudioConnection();
} else { }
player.playTrack(queue.element().getTrack());
} }
} }