--- ../src-base/minecraft/net/minecraft/entity/EntityTracker.java
+++ ../src-work/minecraft/net/minecraft/entity/EntityTracker.java
@@ -77,6 +77,8 @@
 
     public void func_72786_a(Entity p_72786_1_)
     {
+        if (net.minecraftforge.fml.common.registry.EntityRegistry.instance().tryTrackingEntity(this, p_72786_1_)) return;
+
         if (p_72786_1_ instanceof EntityPlayerMP)
         {
             this.func_72791_a(p_72786_1_, 512, 2);