Projectile damage should no longer damage players if PvP is disabled

This commit is contained in:
Garbage Mule committed 2011-09-09 18:15:48 +02:00
1 parent ff7329e3c4
commit 19b011981e
2 files changed
+1 -1

No files matched your search

BIN
View File
Binary file not shown.
+1 -1
View File
@@ -326,7 +326,7 @@ public class MAListener implements ArenaListener
event.setCancelled(true); event.setCancelled(true);
// If PvP is disabled and damager is a player, cancel damage // If PvP is disabled and damager is a player, cancel damage
else if (damager instanceof Player && !arena.pvp) else if (!arena.pvp && (damager instanceof Player || (damager instanceof Projectile && ((Projectile) damager).getShooter() instanceof Player)))
event.setCancelled(true); event.setCancelled(true);
// Log damage // Log damage