From 154f960655de46683250b1f3380322a8286e45e7 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 26 Oct 2025 09:55:49 +0100 Subject: Revert "Core/Entities: followup f4d8105064afdf98212320b5bd1569f2af3fa68a" This reverts commit 6afc4dac6152014c1bf4c1d808c2c9bc9a1c80f2. --- src/server/game/Entities/Unit/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 65b18b43eec..cca0d47a7e2 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8761,7 +8761,7 @@ void Unit::setDeathState(DeathState s) { if (GetMotionMaster()->StopOnDeath()) { - if (GetTypeId() == TYPEID_UNIT && IsInAir(*this, GetFloorZ(), false) && !IsUnderWater()) + if (!HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED) && GetTypeId() == TYPEID_UNIT && ToCreature()->IsInAir(*this, GetFloorZ(), false) && !IsUnderWater()) { GetMotionMaster()->AddFlag(MOTIONMASTER_FLAG_STATIC_PREVENT_INITIALIZATION); SetFall(true); -- cgit v1.2.3