From a855e6221d517297cfb9e2e78b57a6a57fccc85a Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Sun, 5 May 2019 14:07:34 +0200
Subject: Core/Vehicles: Fix accessories disappearing on reset

(cherry picked from commit 6dae4a747da558ca46a777186d4519c32fc1bf04)
---
 src/server/game/AI/CreatureAI.cpp                                     | 3 ---
 src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 84c549553dd..57aa2a6fb88 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -174,9 +174,6 @@ void CreatureAI::EnterEvadeMode(EvadeReason why)
     }
 
     Reset();
-
-    if (me->IsVehicle()) // use the same sequence of addtoworld, aireset may remove all summons!
-        me->GetVehicleKit()->Reset(true);
 }
 
 bool CreatureAI::UpdateVictim()
diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
index dfc6a040236..2a98e2aef88 100644
--- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
@@ -23,6 +23,7 @@
 #include "MovementDefines.h"
 #include "MoveSpline.h"
 #include "MoveSplineInit.h"
+#include "Vehicle.h"
 
 template<class T>
 HomeMovementGenerator<T>::HomeMovementGenerator()
@@ -144,6 +145,8 @@ void HomeMovementGenerator<Creature>::DoFinalize(Creature* owner, bool active, b
         owner->SetWalk(true);
         owner->SetSpawnHealth();
         owner->LoadCreaturesAddon();
+        if (owner->IsVehicle())
+            owner->GetVehicleKit()->Reset(true);
         owner->AI()->JustReachedHome();
     }
 }
-- 
cgit v1.2.3