From f5376af52345632a68c4a50fa4d5dff4500b553f Mon Sep 17 00:00:00 2001 From: addstar Date: Sat, 2 Nov 2013 22:47:39 +1100 Subject: [PATCH] Fix: Now ignores cancelled events.. naughty developer! --- src/nl/Steffion/BlockHunt/Listeners/OnBlockBreakEvent.java | 2 +- src/nl/Steffion/BlockHunt/Listeners/OnBlockPlaceEvent.java | 2 +- .../BlockHunt/Listeners/OnEntityDamageByEntityEvent.java | 2 +- src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageEvent.java | 2 +- src/nl/Steffion/BlockHunt/Listeners/OnFoodLevelChangeEvent.java | 2 +- src/nl/Steffion/BlockHunt/Listeners/OnInventoryClickEvent.java | 2 +- src/nl/Steffion/BlockHunt/Listeners/OnInventoryCloseEvent.java | 2 +- .../BlockHunt/Listeners/OnPlayerCommandPreprocessEvent.java | 2 +- src/nl/Steffion/BlockHunt/Listeners/OnPlayerDropItemEvent.java | 2 +- src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java | 2 +- src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java | 2 +- src/nl/Steffion/BlockHunt/Listeners/OnSignChangeEvent.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnBlockBreakEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnBlockBreakEvent.java index 0182fc0..11330fb 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnBlockBreakEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnBlockBreakEvent.java @@ -14,7 +14,7 @@ import org.bukkit.event.block.BlockBreakEvent; public class OnBlockBreakEvent implements Listener { - @EventHandler(priority = EventPriority.NORMAL) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled=true) public void onBlockBreakEvent(BlockBreakEvent event) { Player player = event.getPlayer(); diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnBlockPlaceEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnBlockPlaceEvent.java index 0e294be..acf11bf 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnBlockPlaceEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnBlockPlaceEvent.java @@ -11,7 +11,7 @@ import org.bukkit.event.block.BlockPlaceEvent; public class OnBlockPlaceEvent implements Listener { - @EventHandler(priority = EventPriority.NORMAL) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled=true) public void onBlockPlaceEvent(BlockPlaceEvent event) { Player player = event.getPlayer(); diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java index 3279738..aaf5f4b 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java @@ -19,7 +19,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public class OnEntityDamageByEntityEvent implements Listener { @SuppressWarnings("deprecation") - @EventHandler(priority = EventPriority.NORMAL) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled=true) public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) { Player player = null; if (event.getEntity() instanceof Player) { diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageEvent.java index 49be2e3..1b4b494 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageEvent.java @@ -13,7 +13,7 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause; public class OnEntityDamageEvent implements Listener { - @EventHandler(priority = EventPriority.NORMAL) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled=true) public void onEntityDamageEvent(EntityDamageEvent event) { Entity ent = event.getEntity(); diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnFoodLevelChangeEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnFoodLevelChangeEvent.java index e435c8d..a0cc4cc 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnFoodLevelChangeEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnFoodLevelChangeEvent.java @@ -11,7 +11,7 @@ import org.bukkit.event.entity.FoodLevelChangeEvent; public class OnFoodLevelChangeEvent implements Listener { - @EventHandler(priority = EventPriority.NORMAL) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled=true) public void onFoodLevelChangeEvent(FoodLevelChangeEvent event) { Player player = (Player) event.getEntity(); diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnInventoryClickEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnInventoryClickEvent.java index 36cf9dc..216df2b 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnInventoryClickEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnInventoryClickEvent.java @@ -22,7 +22,7 @@ import org.bukkit.inventory.ItemStack; public class OnInventoryClickEvent implements Listener { @SuppressWarnings("deprecation") - @EventHandler(priority = EventPriority.NORMAL) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled=true) public void onInventoryClickEvent(InventoryClickEvent event) { Player player = (Player) event.getWhoClicked(); diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnInventoryCloseEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnInventoryCloseEvent.java index 89c9722..10760ba 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnInventoryCloseEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnInventoryCloseEvent.java @@ -18,7 +18,7 @@ import org.bukkit.inventory.ItemStack; public class OnInventoryCloseEvent implements Listener { - @EventHandler(priority = EventPriority.NORMAL) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled=true) public void onInventoryCloseEvent(InventoryCloseEvent event) { Inventory inv = event.getInventory(); if (inv.getType().equals(InventoryType.CHEST)) { diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerCommandPreprocessEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerCommandPreprocessEvent.java index 55ee86f..d9c29d9 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerCommandPreprocessEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerCommandPreprocessEvent.java @@ -15,7 +15,7 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent; public class OnPlayerCommandPreprocessEvent implements Listener { - @EventHandler(priority = EventPriority.HIGH) + @EventHandler(priority = EventPriority.HIGH, ignoreCancelled=true) public void onPlayerCommandPreprocessEvent( PlayerCommandPreprocessEvent event) { Player player = event.getPlayer(); diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerDropItemEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerDropItemEvent.java index f2952f0..67df4ae 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerDropItemEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerDropItemEvent.java @@ -11,7 +11,7 @@ import org.bukkit.event.player.PlayerDropItemEvent; public class OnPlayerDropItemEvent implements Listener { - @EventHandler(priority = EventPriority.NORMAL) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled=true) public void onPlayerDropItemEvent(PlayerDropItemEvent event) { Player player = event.getPlayer(); diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java index 436789a..2fbf026 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java @@ -31,7 +31,7 @@ import org.bukkit.inventory.meta.ItemMeta; public class OnPlayerInteractEvent implements Listener { - @EventHandler(priority = EventPriority.NORMAL) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled=true) public void onPlayerInteractEvent(PlayerInteractEvent event) { Player player = event.getPlayer(); Block block = event.getClickedBlock(); diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java index a3cac72..bc3340a 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java @@ -15,7 +15,7 @@ import org.bukkit.event.player.PlayerMoveEvent; public class OnPlayerMoveEvent implements Listener { - @EventHandler(priority = EventPriority.NORMAL) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled=true) public void onPlayerMoveEvent(PlayerMoveEvent event) { Player player = event.getPlayer(); diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnSignChangeEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnSignChangeEvent.java index f2aee86..9b36a5d 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnSignChangeEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnSignChangeEvent.java @@ -14,7 +14,7 @@ import org.bukkit.event.block.SignChangeEvent; public class OnSignChangeEvent implements Listener { - @EventHandler(priority = EventPriority.NORMAL) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled=true) public void onSignChangeEvent(SignChangeEvent event) { Player player = event.getPlayer(); String[] lines = event.getLines();