Added check for FakePlayer, thanks to @Ipsis and others #9

mchorse · Jan 14, 2017 · 475fb7f · 475fb7f
1 parent 40a241c
commit 475fb7f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/mchorse/metamorph/api/MorphHandler.java b/src/main/java/mchorse/metamorph/api/MorphHandler.java
@@ -12,8 +12,8 @@
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent;
@@ -82,7 +82,12 @@ public void onPlayerKillEntity(LivingDeathEvent event)
         Entity source = event.getSource().getEntity();
         Entity target = event.getEntity();
 
-        if (target.worldObj.isRemote || !(source instanceof EntityPlayerMP) || target instanceof EntityPlayer || Metamorph.proxy.config.prevent_kill_acquire)
+        if (target.worldObj.isRemote || source instanceof FakePlayer)
+        {
+            return;
+        }
+
+        if (!(source instanceof EntityPlayer) || target instanceof EntityPlayer || Metamorph.proxy.config.prevent_kill_acquire)
         {
             return;
         }