From 3f120a45532d96a9ecced8a62e49b931a37d0f2b Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 8 Feb 2019 18:34:23 -0800 Subject: [PATCH] Fixes island deletion handling. https://github.com/BentoBoxWorld/addon-limits/issues/7 --- .../addon/limits/listeners/BlockLimitsListener.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java index 5a9632f..1451835 100644 --- a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java +++ b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityExplodeEvent; import bentobox.addon.limits.Limits; import bentobox.addon.limits.objects.IslandBlockCount; -import world.bentobox.bentobox.api.events.island.IslandEvent.IslandDeletedEvent; +import world.bentobox.bentobox.api.events.island.IslandEvent.IslandDeleteEvent; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.Database; @@ -274,10 +274,12 @@ public class BlockLimitsListener implements Listener { * @param e - island delete event */ @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onIslandDelete(IslandDeletedEvent e) { + public void onIslandDelete(IslandDeleteEvent e) { countMap.remove(e.getIsland().getUniqueId()); saveMap.remove(e.getIsland().getUniqueId()); - handler.deleteID(e.getIsland().getUniqueId()); + if (handler.objectExists(e.getIsland().getUniqueId())) { + handler.deleteID(e.getIsland().getUniqueId()); + } } }