Jonas_Jones/ZtereoMUSIC
1
0
Fork 0
mirror of https://github.com/JonasunderscoreJones/ZtereoMUSIC.git synced 2025-10-26 21:09:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

change: remove useless guild in TrackManager.java

Browse source
This commit is contained in:
ZtereoHYPE 2022-02-08 22:02:00 +01:00
parent 0e108f7acd
commit 099408f545
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/codes/ztereohype/ztereomusic/audio/TrackManager.java
View file

@ -10,7 +10,6 @@ import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason; import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.MessageChannel; import net.dv8tion.jda.api.entities.MessageChannel;
import net.shadew.util.data.Pair; import net.shadew.util.data.Pair;
@ -20,13 +19,11 @@ import java.util.List;
public class TrackManager extends AudioEventAdapter { public class TrackManager extends AudioEventAdapter {
public final List<AudioTrack> trackQueue = new ArrayList<>(); public final List<AudioTrack> trackQueue = new ArrayList<>();
private final @Getter AudioPlayer player; private final @Getter AudioPlayer player;
private final Guild guild;
private @Getter @Setter MessageChannel infoChannel; private @Getter @Setter MessageChannel infoChannel;
public TrackManager(AudioPlayerManager playerManager, MessageChannel infoChannel, Guild guild) { public TrackManager(AudioPlayerManager playerManager, MessageChannel infoChannel) {
this.player = playerManager.createPlayer(); this.player = playerManager.createPlayer();
this.infoChannel = infoChannel; this.infoChannel = infoChannel;
this.guild = guild;
player.addListener(this); player.addListener(this);
} }
@ -69,8 +66,6 @@ public class TrackManager extends AudioEventAdapter {
} }
private void playNext() { private void playNext() {
if (trackQueue.isEmpty()) { if (trackQueue.isEmpty()) {
infoChannel.sendMessage("The queue is empty!").queue(); infoChannel.sendMessage("The queue is empty!").queue();
return; return;
@ -91,6 +86,7 @@ public class TrackManager extends AudioEventAdapter {
@Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
switch (endReason) { switch (endReason) {
case FINISHED -> playNext(); case FINISHED -> playNext();
//todo: warning: this will create an infinite loop if a specific video has issues... //todo: warning: this will create an infinite loop if a specific video has issues...
case LOAD_FAILED -> { case LOAD_FAILED -> {
infoChannel.sendMessage("Loading failed, retrying...").queue(); infoChannel.sendMessage("Loading failed, retrying...").queue();
@ -106,8 +102,8 @@ public class TrackManager extends AudioEventAdapter {
} }
ZtereoMUSIC.getInstance() ZtereoMUSIC.getInstance()
.getPlayerManager() .getPlayerManager()
.loadItem(identifier, new CustomAudioLoadResultHandler(this, infoChannel)); .loadItem(identifier, new CustomAudioLoadResultHandler(this, infoChannel));
} }
} }
@ -120,8 +116,8 @@ public class TrackManager extends AudioEventAdapter {
@Override public void onTrackException(AudioPlayer player, AudioTrack track, FriendlyException exception) { @Override public void onTrackException(AudioPlayer player, AudioTrack track, FriendlyException exception) {
infoChannel.sendMessage( infoChannel.sendMessage(
"Uh oh, a track did something strange. Ask the owner to check for errors in console. Skpping...") "Uh oh, a track did something strange. Ask the owner to check for errors in console. Skpping...")
.queue(); .queue();
System.out.println(exception.getCause().getMessage()); System.out.println(exception.getCause().getMessage());
} }

2
src/main/java/codes/ztereohype/ztereomusic/audio/TrackManagers.java
View file

@ -34,7 +34,7 @@ public class TrackManagers {
TrackManager trackManager = ZtereoMUSIC.getInstance().getGuildTrackManagerMap().get(guildId); TrackManager trackManager = ZtereoMUSIC.getInstance().getGuildTrackManagerMap().get(guildId);
if (trackManager == null) { if (trackManager == null) {
trackManager = new TrackManager(ZtereoMUSIC.getInstance().getPlayerManager(), infoChannel, guild); trackManager = new TrackManager(ZtereoMUSIC.getInstance().getPlayerManager(), infoChannel);
ZtereoMUSIC.getInstance().getGuildTrackManagerMap().put(guildId, trackManager); ZtereoMUSIC.getInstance().getGuildTrackManagerMap().put(guildId, trackManager);
guild.getAudioManager().openAudioConnection(requestedChannel); guild.getAudioManager().openAudioConnection(requestedChannel);
} }