From 6a7c0d69fd564659fdf4f502fdc752c4979eccee Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Mon, 16 Oct 2023 15:03:59 +0700 Subject: [PATCH] make bossbars show that it is not active when disabled --- .../chayapak/chomens_bot/plugins/MusicPlayerPlugin.java | 6 ++++++ .../chipmunk/chayapak/chomens_bot/plugins/TPSPlugin.java | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java index a362f29a..b8abce40 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java @@ -288,6 +288,10 @@ public class MusicPlayerPlugin extends Bot.Listener { } public void removeBossBar() { + final BotBossBar bossBar = bot.bossbar.get(bossbarName); + + if (bossBar != null) bossBar.setTitle(Component.text("No song is currently playing")); + bot.bossbar.remove(bossbarName); } @@ -372,6 +376,8 @@ public class MusicPlayerPlugin extends Bot.Listener { } public void handlePlaying () { + if (currentSong == null) return; + try { currentSong.advanceTime(); while (currentSong.reachedNextNote()) { diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/TPSPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/TPSPlugin.java index bd4b1f0f..b0577f48 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/TPSPlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/TPSPlugin.java @@ -66,6 +66,11 @@ public class TPSPlugin extends Bot.Listener { public void off () { enabled = false; + + final BotBossBar bossBar = bot.bossbar.get(bossbarName); + + if (bossBar != null) bossBar.setTitle(Component.text("TPSBar is currently disabled")); + bot.bossbar.remove(bossbarName); }