From cdf4040f4fce4f1e5ebb33525c4618845605081c Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Fri, 24 Aug 2018 15:34:34 +0200
Subject: Core/Creatures: Restored old initialization order: AI after movement

Closes #22307
---
 src/server/game/Entities/Creature/Creature.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/server')

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 6df264d909f..3a0ad84b232 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -976,13 +976,10 @@ bool Creature::AIM_Create(CreatureAI* ai /*= nullptr*/)
         return false;
     }
 
-    if (!ai)
-        ai = FactorySelector::SelectAI(this);
-
-    SetAI(ai);
-
     Motion_Initialize();
 
+    SetAI(ai ? ai : FactorySelector::SelectAI(this));
+
     return true;
 }
 
-- 
cgit v1.2.3