From 9fe5c3ef5637eaef7426d6d8b01fb54f4691c61a Mon Sep 17 00:00:00 2001 From: drtshock Date: Wed, 29 Apr 2015 08:51:35 -0500 Subject: [PATCH] Ignore cancelled events. --- .../playervaults/listeners/Listeners.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java index 8d9dfa9..0f6563e 100644 --- a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java +++ b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java @@ -28,6 +28,7 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockBreakEvent; @@ -67,17 +68,17 @@ public class Listeners implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onTeleport(PlayerTeleportEvent event) { saveVault(event.getPlayer()); } - @EventHandler + @EventHandler(priority = EventPriority.HIGH) public void onQuit(PlayerQuitEvent event) { saveVault(event.getPlayer()); } - @EventHandler + @EventHandler(priority = EventPriority.HIGH) public void onJoin(PlayerJoinEvent event) { Player player = event.getPlayer(); if (PlayerVaults.getInstance().needsUpdate() && (player.isOp() || player.hasPermission("playervaults.notify"))) { @@ -86,12 +87,12 @@ public class Listeners implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.HIGH) public void onDeath(PlayerDeathEvent event) { saveVault(event.getEntity()); } - @EventHandler + @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onClose(InventoryCloseEvent event) { HumanEntity he = event.getPlayer(); if (he instanceof Player) { @@ -99,7 +100,7 @@ public class Listeners implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onInteract(PlayerInteractEvent event) { Player player = event.getPlayer(); if (event.getAction() == Action.RIGHT_CLICK_BLOCK) { @@ -187,17 +188,17 @@ public class Listeners implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onBlockPhysics(BlockPhysicsEvent event) { blockChangeCheck(event.getBlock().getLocation()); } - @EventHandler + @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onEntityChangeBlock(EntityChangeBlockEvent event) { blockChangeCheck(event.getBlock().getLocation()); } - @EventHandler + @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onBlockBreak(BlockBreakEvent event) { blockChangeCheck(event.getBlock().getLocation()); } @@ -218,7 +219,7 @@ public class Listeners implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onInteractEntity(PlayerInteractEntityEvent event) { Player player = event.getPlayer(); EntityType type = event.getRightClicked().getType();