From 042f5515e4f3e52b0d2e23d9b9e147041849ce12 Mon Sep 17 00:00:00 2001
From: Treeston <treeston.mmoc@gmail.com>
Date: Thu, 23 Aug 2018 14:33:28 +0200
Subject: Core/AI: Clean up charm AI handling, we now have two unique_ptr
 instead of a crapton of booleans

---
 src/server/game/Scripting/ScriptMgr.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/server/game/Scripting/ScriptMgr.cpp')

diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 16c6bc1a281..d63eca92429 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -432,7 +432,9 @@ class CreatureGameObjectScriptRegistrySwapHooks
         if (!creature->IsAlive())
             return;
 
-        creature->AI_InitializeAndEnable();
+        creature->AI()->InitializeAI();
+        if (creature->GetVehicleKit())
+            creature->GetVehicleKit()->Reset();
         creature->AI()->EnterEvadeMode();
 
         // Cast a dummy visual spell asynchronously here to signal
-- 
cgit v1.2.3