TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 19:50:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #496 from RoboMWM/patch-4

Browse source 
Don't blindly check cancel status for all damage
This commit is contained in:
OmniCypher 2016-06-09 15:47:57 -07:00 committed by GitHub
commit 442eb0e7ea
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/com/projectkorra/projectkorra/PKListener.java
View file

@ -733,11 +733,8 @@ public class PKListener implements Listener {
event.setFormat(format); event.setFormat(format);
} }
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler(priority = EventPriority.NORMAL)
public void onPlayerDamage(EntityDamageEvent event) { public void onPlayerDamage(EntityDamageEvent event) {
if (event.isCancelled()) {
return;
}
if (event.getEntity() instanceof Player) { if (event.getEntity() instanceof Player) {
Player player = (Player) event.getEntity(); Player player = (Player) event.getEntity();