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

Merge Greg's branch into the master branch #310

Merged
greg6775 merged 18 commits from greg-dev into master 2020-01-10 19:26:21 +01:00
Conversation 0 Commits 18 Files changed 7 +2 -5
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3de4153c87 - Show all commits

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

@ -20,7 +20,6 @@ public class TrackManager extends AudioEventAdapter {
private final AudioPlayer player; private final AudioPlayer player;
private final Queue<AudioInfo> queue; private final Queue<AudioInfo> queue;
private boolean loop = false; private boolean loop = false;
AudioTrack lastTrack;
public TrackManager(AudioPlayer player) { public TrackManager(AudioPlayer player) {
this.player = player; this.player = player;
@ -49,11 +48,9 @@ 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) {
this.lastTrack = track; Guild g = queue.element().getAuthor().getGuild();
Guild g = queue.poll().getAuthor().getGuild();
if (loop) { if (loop) {
player.playTrack(track.makeClone());
player.playTrack(this.lastTrack.makeClone());
} else if (queue.isEmpty()) { } else if (queue.isEmpty()) {
g.getAudioManager().closeAudioConnection(); g.getAudioManager().closeAudioConnection();
} else { } else {