From c983e68392f2c333c55aa384186a6e09f90e7110 Mon Sep 17 00:00:00 2001 From: ceze88 Date: Wed, 13 Sep 2023 13:52:04 +0200 Subject: [PATCH] Fix NPEs --- .../UltimateStacker.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/UltimateStacker.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/UltimateStacker.java index d195bc6..ec7991a 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/UltimateStacker.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/UltimateStacker.java @@ -111,8 +111,9 @@ public class UltimateStacker extends SongodaPlugin { @Override public void onPluginDisable() { - this.stackingTask.stop(); - this.stackingTask = null; + if (this.stackingTask != null) { + this.stackingTask.stop(); + } this.dataManager.saveBatchSync(this.spawnerStackManager.getStacksData()); this.dataManager.saveBatchSync(this.blockStackManager.getStacksData()); this.dataManager.shutdownNow(); @@ -355,11 +356,14 @@ public class UltimateStacker extends SongodaPlugin { public void updateHologram(Hologramable stack) { // Is this stack invalid? - if (!stack.isValid()) - if (stack instanceof BlockStackImpl) + if (!stack.isValid()) { + if (stack instanceof BlockStackImpl) { blockStackManager.removeBlock(stack.getLocation()); - else if (stack instanceof SpawnerStackImpl) + } else if (stack instanceof SpawnerStackImpl) { spawnerStackManager.removeSpawner(stack.getLocation()); + } + return; + } // are holograms enabled? if (!stack.areHologramsEnabled() && !HologramManager.getManager().isEnabled()) return; // update the hologram