* When canceled no hit sound.

This commit is contained in:
Steffion 2013-08-08 19:51:08 +02:00
parent cdc7b188a4
commit 05b6d2d85b

View File

@ -32,21 +32,19 @@ public class OnEntityDamageByEntityEvent implements Listener {
if (arena.seekers.contains(player) if (arena.seekers.contains(player)
&& arena.seekers.contains(event.getDamager())) { && arena.seekers.contains(event.getDamager())) {
event.setCancelled(true); event.setCancelled(true);
} } else if (arena.playersInArena.contains(player)
if (arena.playersInArena.contains(player)
&& arena.playersInArena.contains(event && arena.playersInArena.contains(event
.getDamager()) .getDamager())
&& !arena.seekers.contains(player)) { && !arena.seekers.contains(player)) {
event.setCancelled(true); event.setCancelled(true);
} } else {
player.playEffect(player.getLocation(), player.playEffect(player.getLocation(),
Effect.BOW_FIRE, 0); Effect.BOW_FIRE, 0);
event.getDamager() event.getDamager()
.getLocation() .getLocation()
.getWorld() .getWorld()
.playEffect(event.getDamager().getLocation(), .playEffect(
event.getDamager().getLocation(),
Effect.BOW_FIRE, 0); Effect.BOW_FIRE, 0);
} }
} }
@ -54,3 +52,4 @@ public class OnEntityDamageByEntityEvent implements Listener {
} }
} }
} }
}