From 263ce0cd308d508235d0201937b3b29911600722 Mon Sep 17 00:00:00 2001 From: Meji Date: Sat, 17 Dec 2022 23:48:04 +0100 Subject: [PATCH] Core/Creatures: Never enable gravity for creatures that can only fly (#28411) --- src/server/game/Entities/Creature/Creature.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 9a6b319f723..37bc520a8ee 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2778,7 +2778,7 @@ void Creature::UpdateMovementFlags() bool canHover = CanHover(); bool isInAir = (G3D::fuzzyGt(GetPositionZ(), ground + (canHover ? *m_unitData->HoverHeight : 0.0f) + GROUND_HEIGHT_TOLERANCE) || G3D::fuzzyLt(GetPositionZ(), ground - GROUND_HEIGHT_TOLERANCE)); // Can be underground too, prevent the falling - if (GetMovementTemplate().IsFlightAllowed() && isInAir && !IsFalling()) + if (GetMovementTemplate().IsFlightAllowed() && (isInAir || !GetMovementTemplate().IsGroundAllowed()) && !IsFalling()) { if (GetMovementTemplate().Flight == CreatureFlightMovementType::CanFly) SetCanFly(true);