1 files changed, 5 insertions, 4 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index a1f37c65f1e..4fd772091cf 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -691,17 +691,18 @@ void Creature::Motion_Initialize()
 
 bool Creature::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 team, float x, float y, float z, float ang, const CreatureData *data)
 {
+    ASSERT(map);
+    SetMap(map);
+    SetPhaseMask(phaseMask,false);
+
     Relocate(x, y, z, ang);
+
     if(!IsPositionValid())
     {
         sLog.outError("Creature (guidlow %d, entry %d) not loaded. Suggested coordinates isn't valid (X: %f Y: %f)",guidlow,Entry,x,y);
         return false;
     }
 
-    ASSERT(map);
-    SetMap(map);
-    SetPhaseMask(phaseMask,false);
-
     //oX = x;     oY = y;    dX = x;    dY = y;    m_moveTime = 0;    m_startMove = 0;
     const bool bResult = CreateFromProto(guidlow, Entry, team, data);