From 3aa1bf7ffdf83bbc40fadef66e6070601ede2d90 Mon Sep 17 00:00:00 2001 From: Hut512 Date: Mon, 7 Sep 2026 21:11:21 +0200 Subject: [PATCH] Fix scoreboard cleanup --- .../de/steamwar/bausystem/features/world/BauScoreboard.java | 1 + .../src/de/steamwar/scoreboard/SWScoreboard.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java index e7492216..a56a255e 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java @@ -131,6 +131,7 @@ public class BauScoreboard implements Listener { @EventHandler public void onPlayerQuit(PlayerQuitEvent event) { + SWScoreboard.impl.removeScoreboard(event.getPlayer()); ADDITIONAL_SCOREBOARD_LINES.remove(event.getPlayer()); } } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java index c7c50e88..16a33267 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java @@ -67,7 +67,9 @@ public class SWScoreboard { } public void removeScoreboard(Player player) { - player.getScoreboard().getObjective(SIDEBAR).unregister(); + if (player.getScoreboard().getObjective(SIDEBAR) != null) { + player.getScoreboard().getObjective(SIDEBAR).unregister(); + } playerBoards.remove(player); } }