diff --git a/MobArena.jar b/MobArena.jar
index f1b11be..3ed9d07 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 59f5bbe..0764f44 100644
--- a/src/com/garbagemule/MobArena/MAListener.java
+++ b/src/com/garbagemule/MobArena/MAListener.java
@@ -295,8 +295,9 @@ public class MAListener implements ArenaListener
         if (!arena.running) return;
         
         EntityDamageByEntityEvent e = (event instanceof EntityDamageByEntityEvent) ? (EntityDamageByEntityEvent) event : null;
-        Entity damager = (e != null) ? e.getDamager() : null;
         Entity damagee = event.getEntity();
+        Entity damager = (e != null) ? e.getDamager() : null;
+        if (e != null) damager = ((Projectile) e.getDamager()).getShooter();
         
         // Pet wolf
         if (damagee instanceof Wolf && arena.pets.contains(damagee))
@@ -326,7 +327,7 @@ public class MAListener implements ArenaListener
             event.setCancelled(true);
         
         // If PvP is disabled and damager is a player, cancel damage
-        else if (!arena.pvp && (damager instanceof Player || (damager instanceof Projectile && ((Projectile) damager).getShooter() instanceof Player)))
+        else if (!arena.pvp && damager instanceof Player)
             event.setCancelled(true);
         
         // Log damage
@@ -340,14 +341,13 @@ public class MAListener implements ArenaListener
         {
             if (arena.hellhounds)
                 pet.setFireTicks(32768);
-            
             event.setCancelled(true);
         }
-        
-        // Cancel player and projectile damage
         else if (damager instanceof Player || damager instanceof Projectile)
+        {
+            // Cancel player and projectile damage
             event.setCancelled(true);
-        
+        }
         // Set damage to 0 for knockbacks from monsters
         else event.setDamage(0);
     }
diff --git a/src/com/garbagemule/MobArena/MobArena.java b/src/com/garbagemule/MobArena/MobArena.java
index 7823450..c6ac478 100644
--- a/src/com/garbagemule/MobArena/MobArena.java
+++ b/src/com/garbagemule/MobArena/MobArena.java
@@ -135,7 +135,7 @@ public class MobArena extends JavaPlugin
         pm.registerEvent(Event.Type.PLAYER_KICK,               playerListener,   Priority.Normal,  this);
         pm.registerEvent(Event.Type.PLAYER_JOIN,               playerListener,   Priority.Normal,  this);
         pm.registerEvent(Event.Type.PLAYER_ANIMATION,          playerListener,   Priority.Normal,  this);
-        pm.registerEvent(Event.Type.ENTITY_DAMAGE,             entityListener,   Priority.High,    this); // mcMMO is "Highest"
+        pm.registerEvent(Event.Type.ENTITY_DAMAGE,             entityListener,   Priority.Low,     this); // Must cancel before Heroes
         pm.registerEvent(Event.Type.ENTITY_DEATH,              entityListener,   Priority.Lowest,  this); // Lowest because of Tombstone
         pm.registerEvent(Event.Type.ENTITY_REGAIN_HEALTH,      entityListener,   Priority.Normal,  this);
         pm.registerEvent(Event.Type.ENTITY_EXPLODE,            entityListener,   Priority.Highest, this);