misc/chomens-bot-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: don't remove bossbar when skip is ran and there are songs left to play

Browse Source
This commit is contained in:
ChomeNS
2024-12-28 13:49:14 +07:00
parent 0a42fb68b2
commit 4ace6afccc
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java
View File

@@ -1,18 +1,17 @@
package me.chayapak1.chomens_bot.plugins;
import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
import org.geysermc.mcprotocollib.protocol.data.game.BossBarColor;
import org.geysermc.mcprotocollib.protocol.data.game.BossBarDivision;
import me.chayapak1.chomens_bot.Bot;
import me.chayapak1.chomens_bot.data.BotBossBar;
import me.chayapak1.chomens_bot.data.PlayerEntry;
import me.chayapak1.chomens_bot.song.*;
import me.chayapak1.chomens_bot.song.*;
import me.chayapak1.chomens_bot.util.ColorUtilities;
import me.chayapak1.chomens_bot.util.MathUtilities;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.cloudburstmc.math.vector.Vector3f;
import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
import org.geysermc.mcprotocollib.protocol.data.game.BossBarColor;
import org.geysermc.mcprotocollib.protocol.data.game.BossBarDivision;
import java.io.IOException;
import java.net.URL;
@@ -142,7 +141,7 @@ public class MusicPlayerPlugin extends Bot.Listener {
addBossBar();
currentSong = songQueue.get(0); // songQueue.poll();
currentSong = songQueue.getFirst(); // songQueue.poll();
bot.chat.tellraw(
Component.translatable(
"Now playing %s",
@@ -191,16 +190,15 @@ public class MusicPlayerPlugin extends Bot.Listener {
return;
}
songQueue.remove(0);
songQueue.removeFirst();
if (songQueue.isEmpty()) {
stopPlaying();
removeBossBar();
return;
}
if (currentSong.size() > 0) {
currentSong = songQueue.get(0);
currentSong = songQueue.getFirst();
currentSong.setTime(0);
currentSong.play();
}
@@ -216,13 +214,15 @@ public class MusicPlayerPlugin extends Bot.Listener {
public void skip () {
if (loop == Loop.ALL) {
songQueue.add(songQueue.remove(0)); // bot.music.queue.push(bot.music.queue.shift()) in js
songQueue.add(songQueue.removeFirst()); // bot.music.queue.push(bot.music.queue.shift()) in js
} else {
songQueue.remove(0);
stopPlaying();
songQueue.removeFirst();
}
if (songQueue.isEmpty()) return;
currentSong = songQueue.get(0);
if (songQueue.isEmpty()) {
stopPlaying();
return;
}
currentSong = songQueue.getFirst();
currentSong.setTime(0);
currentSong.play();
}