From 0894c2e2485c2d349fd5e5bf3ed0eece86a43da5 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Wed, 2 Jan 2019 13:22:44 +0100 Subject: [PATCH] Revert "Added death resetting." This reverts commit 1121bbcbb50af055d5c27ee1c8e618a343167d48. --- .../bentobox/level/listeners/NewIslandListener.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/world/bentobox/level/listeners/NewIslandListener.java b/src/main/java/world/bentobox/level/listeners/NewIslandListener.java index 10b69f2..9b9e463 100644 --- a/src/main/java/world/bentobox/level/listeners/NewIslandListener.java +++ b/src/main/java/world/bentobox/level/listeners/NewIslandListener.java @@ -7,11 +7,11 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; +import world.bentobox.level.Level; +import world.bentobox.level.calculators.CalcIslandLevel; import world.bentobox.bentobox.api.events.island.IslandEvent.IslandCreatedEvent; import world.bentobox.bentobox.api.events.island.IslandEvent.IslandResettedEvent; import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.level.Level; -import world.bentobox.level.calculators.CalcIslandLevel; /** * Listens for new islands and sets the level to zero automatically @@ -34,17 +34,11 @@ public class NewIslandListener implements Listener { @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onNewIsland(IslandCreatedEvent e) { cil.putIfAbsent(e.getIsland(), new CalcIslandLevel(addon, e.getIsland(), () -> zeroLevel(e.getIsland()))); - // Set deaths to zero just in case - addon.getPlayers().setDeaths(e.getIsland().getWorld(), e.getOwner(), 0); } @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onNewIsland(IslandResettedEvent e) { cil.putIfAbsent(e.getIsland(), new CalcIslandLevel(addon, e.getIsland(), () -> zeroLevel(e.getIsland()))); - // Reset deaths - if (addon.getSettings().isIslandResetDeathReset()) { - addon.getPlayers().setDeaths(e.getIsland().getWorld(), e.getOwner(), 0); - } } private void zeroLevel(Island island) {