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 -1
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8b855b2676 - Show all commits

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

@ -49,9 +49,10 @@ 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.poll().getAuthor().getGuild(); Guild g = queue.poll().getAuthor().getGuild();
if (loop) { if (loop) {
player.startTrack(lastTrack.makeClone(), false); player.playTrack(lastTrack.makeClone());
} else if (queue.isEmpty()) { } else if (queue.isEmpty()) {
g.getAudioManager().closeAudioConnection(); g.getAudioManager().closeAudioConnection();
} else { } else {