From 6ebaad18479ba5e9882ef0dce18778c453e86399 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Tue, 16 Nov 2010 14:00:47 +0100
Subject: [PATCH] Core: Add validation-test for adding creatures to the world -
 fix by Paradox Closes issue 4807

--HG--
branch : trunk
---
 src/server/game/Entities/Creature/Creature.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 01ad4fd12d..74c6263d5b 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())