diff --git a/MobArena.jar b/MobArena.jar
index 2035e45..de8ea17 100644
Binary files a/MobArena.jar and b/MobArena.jar differ
diff --git a/src/com/garbagemule/MobArena/MAListener.java b/src/com/garbagemule/MobArena/MAListener.java
index c076c3b..59f5bbe 100644
--- a/src/com/garbagemule/MobArena/MAListener.java
+++ b/src/com/garbagemule/MobArena/MAListener.java
@@ -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