From 05b6d2d85b543a15e988fee4cb2e24d1017e7133 Mon Sep 17 00:00:00 2001 From: Steffion Date: Thu, 8 Aug 2013 19:51:08 +0200 Subject: [PATCH] * When canceled no hit sound. --- .../OnEntityDamageByEntityEvent.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java index 57cca26..916fd1b 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java @@ -32,22 +32,21 @@ public class OnEntityDamageByEntityEvent implements Listener { if (arena.seekers.contains(player) && arena.seekers.contains(event.getDamager())) { event.setCancelled(true); - } - - if (arena.playersInArena.contains(player) + } else if (arena.playersInArena.contains(player) && arena.playersInArena.contains(event .getDamager()) && !arena.seekers.contains(player)) { event.setCancelled(true); + } else { + player.playEffect(player.getLocation(), + Effect.BOW_FIRE, 0); + event.getDamager() + .getLocation() + .getWorld() + .playEffect( + event.getDamager().getLocation(), + Effect.BOW_FIRE, 0); } - - player.playEffect(player.getLocation(), - Effect.BOW_FIRE, 0); - event.getDamager() - .getLocation() - .getWorld() - .playEffect(event.getDamager().getLocation(), - Effect.BOW_FIRE, 0); } } }