--- a/net/minecraft/server/EntityEvokerFangs.java
+++ b/net/minecraft/server/EntityEvokerFangs.java
@@ -111,7 +111,9 @@
 
         if (entityliving.isAlive() && !entityliving.bl() && entityliving != entityliving1) {
             if (entityliving1 == null) {
+                org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = this; // CraftBukkit
                 entityliving.damageEntity(DamageSource.MAGIC, 6.0F);
+                org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = null; // CraftBukkit
             } else {
                 if (entityliving1.r(entityliving)) {
                     return;