Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-11-26 12:36:00 +01:00
Code Issues Projects Releases Wiki Activity

Projectile damage should no longer damage players if PvP is disabled

Browse Source
This commit is contained in:
Garbage Mule 2011-09-09 18:15:48 +02:00
parent ff7329e3c4
commit 19b011981e
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
MobArena.jar
View File

Binary file not shown.

2
src/com/garbagemule/MobArena/MAListener.java
View File

@ -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