Core: Add validation-test for adding creatures to the world - fix by Paradox

Closes issue 4807

--HG--
branch : trunk

1 files changed, 7 insertions, 0 deletions

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 01ad4fd12da..74c6263d5bf 100755
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -744,6 +744,13 @@ bool Creature::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry,
     SetMap(map);
     SetPhaseMask(phaseMask,false);
 
+    CreatureInfo const *cinfo = sObjectMgr.GetCreatureTemplate(Entry);
+    if (!cinfo)
+    {
+        sLog.outErrorDb("Creature entry %u does not exist.", Entry);
+        return false;
+    }
+
     Relocate(x, y, z, ang);
 
     if (!IsPositionValid())