Revert "Core/Entities: followup f4d8105"

Shauren · Shauren · commit 154f960655de · 2025-10-26T09:55:49.000+01:00
This reverts commit 6afc4da.
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -8761,7 +8761,7 @@ void Unit::setDeathState(DeathState s)`
`8761`	`8761`	`{`
`8762`	`8762`	`if (GetMotionMaster()->StopOnDeath())`
`8763`	`8763`	`{`
`8764`		`- if (GetTypeId() == TYPEID_UNIT && IsInAir(*this, GetFloorZ(), false) && !IsUnderWater())`
	`8764`	`+ if (!HasUnitState(UNIT_STATE_ROOT \| UNIT_STATE_STUNNED) && GetTypeId() == TYPEID_UNIT && ToCreature()->IsInAir(*this, GetFloorZ(), false) && !IsUnderWater())`
`8765`	`8765`	`{`
`8766`	`8766`	`GetMotionMaster()->AddFlag(MOTIONMASTER_FLAG_STATIC_PREVENT_INITIALIZATION);`
`8767`	`8767`	`SetFall(true);`