From ac3a9d6112596d4fbd489a4fd03c5864c099ff20 Mon Sep 17 00:00:00 2001
From: xinef1 <w.szyszko2@gmail.com>
Date: Mon, 30 Jan 2017 10:57:24 +0100
Subject: [PATCH] Core/Creatures: Stop falling if corpse is removed (can happen
 when alive unit is despawned instantly in air) (#18995)

Do not allow to start waypoint movement when unit is dead
---
 src/server/game/Entities/Creature/Creature.cpp                | 4 ++++
 .../Movement/MovementGenerators/WaypointMovementGenerator.cpp | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index ebd11fccc14..7743e58b2e5 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -295,6 +295,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 7862194a419..f4891228e4f 100755
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -98,6 +98,10 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
     if (!i_path || i_path->empty())
         return false;
 
+    // Dont allow dead creatures to move
+    if (!creature->IsAlive())
+        return false;
+
     if (Stopped())
         return true;