Projectile damage should no longer damage players if PvP is disabled

2011-09-09 18:15:48 +02:00
parent ff7329e3c4
commit 19b011981e
2 changed files with 1 additions and 1 deletions
@@ -326,7 +326,7 @@ public class MAListener implements ArenaListener
            event.setCancelled(true);
        
        // 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);
        
        // Log damage