diff options
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index d7ae09c1ab6..6b9e5bd74ed 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -287,6 +287,10 @@ void Creature::RemoveCorpse(bool setSpawnTime) if (setSpawnTime) m_respawnTime = time(NULL) + respawnDelay; + // if corpse was removed during falling, the falling will continue and override relocation to respawn position + if (IsFalling()) + StopMoving(); + float x, y, z, o; GetRespawnPosition(x, y, z, &o); SetHomePosition(x, y, z, o); diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index 51e54b3ba26..c9f75345754 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -120,6 +120,9 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature) if (!i_path || i_path->nodes.empty()) return false; + if (Stopped()) + return true; + bool transportPath = creature->GetTransport() != nullptr; if (IsArrivalDone) |