From 403b4a2f0c55702c615073b130e18cf53e10cbc8 Mon Sep 17 00:00:00 2001 From: Steffion Date: Tue, 8 Oct 2013 17:24:39 +0200 Subject: [PATCH] * Fixed players able to die in lava, etc. Fixes #29. --- src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageEvent.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageEvent.java index 536ca2a..49be2e3 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageEvent.java @@ -21,8 +21,7 @@ public class OnEntityDamageEvent implements Listener { Player player = (Player) event.getEntity(); for (Arena arena : W.arenaList) { if (arena.playersInArena.contains(player)) { - if (event.getCause().equals(DamageCause.FALL) - || event.getCause().equals(DamageCause.DROWNING)) { + if (!event.getCause().equals(DamageCause.ENTITY_ATTACK)) { event.setCancelled(true); } }