diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java index 8e2cef34c..64d388221 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java @@ -28,7 +28,7 @@ public class AuthMeEntityListener implements Listener { this.instance = instance; } - @EventHandler + @EventHandler (priority = EventPriority.LOWEST) public void onEntityDamage(EntityDamageEvent event) { if (event.isCancelled()) { return; @@ -62,10 +62,11 @@ public class AuthMeEntityListener implements Listener { } } player.setFireTicks(0); + event.setDamage(0.0); event.setCancelled(true); } - @EventHandler + @EventHandler (priority = EventPriority.LOWEST) public void onEntityTarget(EntityTargetEvent event) { if (event.isCancelled()) { return; @@ -96,7 +97,7 @@ public class AuthMeEntityListener implements Listener { event.setCancelled(true); } - @EventHandler + @EventHandler (priority = EventPriority.LOWEST) public void onFoodLevelChange(FoodLevelChangeEvent event) { if (event.isCancelled()) { return; @@ -154,10 +155,11 @@ public class AuthMeEntityListener implements Listener { } } + event.setAmount(0.0); event.setCancelled(true); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.HIGHEST) public void onEntityInteract(EntityInteractEvent event) { if (event.isCancelled() || event == null) { return; diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index 41acdd1e3..5efc6d56b 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -916,7 +916,7 @@ public class AuthMePlayerListener implements Listener { player.saveData(); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerPickupItem(PlayerPickupItemEvent event) { if (event.isCancelled() || event.getPlayer() == null) { return; @@ -975,7 +975,7 @@ public class AuthMePlayerListener implements Listener { event.setCancelled(true); } - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.LOWEST) public void onPlayerInventoryOpen(InventoryOpenEvent event) { if (event.isCancelled() || event.getPlayer() == null) return; @@ -1002,7 +1002,7 @@ public class AuthMePlayerListener implements Listener { player.closeInventory(); } - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.LOWEST) public void onPlayerInventoryClick(InventoryClickEvent event) { if (event.isCancelled() || event.getWhoClicked() == null) return;