diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java b/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java
index 0470f415de..952ceacb61 100644
--- a/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java
+++ b/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java
@@ -15,6 +15,7 @@ public class ModLoaderEntitySpawnCallback implements Function<EntitySpawnPacket,
 
     private BaseModProxy mod;
     private EntityRegistration registration;
+    private boolean isAnimal;
 
     public ModLoaderEntitySpawnCallback(BaseModProxy mod, EntityRegistration er)
     {
diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java b/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java
index b3c86d2a69..ab70ab586f 100644
--- a/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java
+++ b/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java
@@ -26,7 +26,9 @@ import com.google.common.collect.Maps;
 import net.minecraft.src.BaseMod;
 import net.minecraft.src.Container;
 import net.minecraft.src.Entity;
+import net.minecraft.src.EntityDragon;
 import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.IAnimals;
 import net.minecraft.src.ICommand;
 import net.minecraft.src.TradeEntry;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -169,7 +171,7 @@ public class ModLoaderHelper
             boolean sendVelocityInfo)
     {
         EntityRegistration er = EntityRegistry.registerModLoaderEntity(mod, entityClass, entityTypeId, updateRange, updateInterval, sendVelocityInfo);
-        er.setCustomSpawning(new ModLoaderEntitySpawnCallback(mod, er));
+        er.setCustomSpawning(new ModLoaderEntitySpawnCallback(mod, er), !(EntityDragon.class.isAssignableFrom(entityClass) || IAnimals.class.isAssignableFrom(entityClass)));
     }
 
     private static ModLoaderVillageTradeHandler[] tradeHelpers = new ModLoaderVillageTradeHandler[6];
diff --git a/common/cpw/mods/fml/common/network/FMLNetworkHandler.java b/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
index 0e4995c06e..f4595b8a79 100644
--- a/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
+++ b/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
@@ -329,6 +329,10 @@ public class FMLNetworkHandler
         {
             return null;
         }
+        if (er.usesVanillaSpawning())
+        {
+            return null;
+        }
         Packet250CustomPayload pkt = new Packet250CustomPayload();
         pkt.field_73630_a = "FML";
         pkt.field_73629_c = FMLPacket.makePacket(Type.ENTITYSPAWN, er, entity, instance().findNetworkModHandler(er.getContainer()));
diff --git a/common/cpw/mods/fml/common/registry/EntityRegistry.java b/common/cpw/mods/fml/common/registry/EntityRegistry.java
index adefea298d..544e1cb65c 100644
--- a/common/cpw/mods/fml/common/registry/EntityRegistry.java
+++ b/common/cpw/mods/fml/common/registry/EntityRegistry.java
@@ -41,6 +41,7 @@ public class EntityRegistry
         private int updateFrequency;
         private boolean sendsVelocityUpdates;
         private Function<EntitySpawnPacket, Entity> customSpawnCallback;
+        private boolean usesVanillaSpawning;
         public EntityRegistration(ModContainer mc, Class<? extends Entity> entityClass, String entityName, int id, int trackingRange, int updateFrequency, boolean sendsVelocityUpdates)
         {
             this.container = mc;
@@ -79,6 +80,11 @@ public class EntityRegistry
         {
             return sendsVelocityUpdates;
         }
+
+        public boolean usesVanillaSpawning()
+        {
+            return usesVanillaSpawning;
+        }
         public boolean hasCustomSpawning()
         {
             return customSpawnCallback != null;
@@ -87,9 +93,10 @@ public class EntityRegistry
         {
             return customSpawnCallback.apply(packet);
         }
-        public void setCustomSpawning(Function<EntitySpawnPacket, Entity> callable)
+        public void setCustomSpawning(Function<EntitySpawnPacket, Entity> callable, boolean usesVanillaSpawning)
         {
             this.customSpawnCallback = callable;
+            this.usesVanillaSpawning = usesVanillaSpawning;
         }
     }