From d242ecd1fc0d066ac1e087e42fe26c649fab421d Mon Sep 17 00:00:00 2001 From: RoboMWM Date: Thu, 19 May 2016 16:08:30 -0700 Subject: [PATCH] Don't blindly check cancel status for all damage If fall damage is disabled via another plugin like WorldGuard, abilities like Shockwave can't function upon landing. Plus, there's already a lot of checks for event.isCancelled, so don't see a reason to do a check for the entire event. --- src/com/projectkorra/projectkorra/PKListener.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/com/projectkorra/projectkorra/PKListener.java b/src/com/projectkorra/projectkorra/PKListener.java index 088703a4..849c39b6 100644 --- a/src/com/projectkorra/projectkorra/PKListener.java +++ b/src/com/projectkorra/projectkorra/PKListener.java @@ -732,11 +732,8 @@ public class PKListener implements Listener { event.setFormat(format); } - @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL) public void onPlayerDamage(EntityDamageEvent event) { - if (event.isCancelled()) { - return; - } if (event.getEntity() instanceof Player) { Player player = (Player) event.getEntity();