From cd72a243af5c3ad7343d06e0c83a27088f9749ad Mon Sep 17 00:00:00 2001 From: jackpoz Date: Tue, 28 Jul 2015 19:54:49 +0200 Subject: [PATCH] Merge pull request #15168 from jameyboor/3.3.5 Core/Creature: Fix Creature::UpdateMovementFlags() ignoring DynamicTree height Fix Creature::UpdateMovementFlags() checking only maps/vmaps height and skipping GameObject height stored in DynamicTree (cherry picked from commit a7ee951d9efcfb0a0a5b9ed1ec3a732c06d8877f) --- 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 c1e7ec2fa6..21ea55aba0 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2483,7 +2483,7 @@ void Creature::UpdateMovementFlags() return; // Set the movement flags if the creature is in that mode. (Only fly if actually in air, only swim if in water, etc) - float ground = GetMap()->GetHeight(GetPositionX(), GetPositionY(), GetPositionZMinusOffset()); + float ground = GetMap()->GetHeight(GetPhaseMask(), GetPositionX(), GetPositionY(), GetPositionZMinusOffset()); bool isInAir = (G3D::fuzzyGt(GetPositionZMinusOffset(), ground + 0.05f) || G3D::fuzzyLt(GetPositionZMinusOffset(), ground - 0.05f)); // Can be underground too, prevent the falling