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

Clean up static abuse, use traditional OOP style

Browse source
This commit is contained in:
Reperak 2021-11-07 20:50:56 -06:00
parent a7a0e0fae6
commit 0fa9ceef8e
No known key found for this signature in database
GPG key ID: 12F30C9BA6950C0C
4 changed files with 51 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/codes/ztereohype/ztereomusic/audio/GuildMusicPlayers.java
View file

@ -14,14 +14,14 @@ public class GuildMusicPlayers {
// If I get called in a different vc I delete the old manager
if (!isInSameVC) {
Bot.guildMusicPlayerMap.remove(guildId);
Bot.getInstance().getGuildMusicPlayerMap().remove(guildId);
}
GuildMusicPlayer musicPlayer = Bot.guildMusicPlayerMap.get(guildId);
GuildMusicPlayer musicPlayer = Bot.getInstance().getGuildMusicPlayerMap().get(guildId);
if (musicPlayer == null) {
musicPlayer = new GuildMusicPlayer(Bot.playerManager, infoChannel);
Bot.guildMusicPlayerMap.put(guildId, musicPlayer);
musicPlayer = new GuildMusicPlayer(Bot.getInstance().getPlayerManager(), infoChannel);
Bot.getInstance().getGuildMusicPlayerMap().put(guildId, musicPlayer);
guild.getAudioManager().openAudioConnection(requestedChannel);
}
@ -33,7 +33,7 @@ public class GuildMusicPlayers {
// stops player, disconnects from vc, and deletes the wrapper
public static void removeGuildAudioPlayer(Guild guild) {
long guildId = guild.getIdLong();
GuildMusicPlayer musicPlayer = Bot.guildMusicPlayerMap.get(guildId);
GuildMusicPlayer musicPlayer = Bot.getInstance().getGuildMusicPlayerMap().get(guildId);
if (musicPlayer == null) return;
@ -41,6 +41,6 @@ public class GuildMusicPlayers {
guild.getAudioManager().closeAudioConnection();
//todo: remove this when will be part of disconnection listener
Bot.guildMusicPlayerMap.remove(guildId);
Bot.getInstance().getGuildMusicPlayerMap().remove(guildId);
}
}