aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/game/AI/CreatureAI.cpp3
-rw-r--r--src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 4cca5d1d609..81b860ccf20 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -167,9 +167,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 fe88746786e..ce7bb76ce09 100644
--- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
@@ -24,6 +24,7 @@
#include "MovementDefines.h"
#include "MoveSpline.h"
#include "MoveSplineInit.h"
+#include "Vehicle.h"
template<class T>
HomeMovementGenerator<T>::HomeMovementGenerator()
@@ -145,6 +146,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();
}
}