diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-07-28 19:54:49 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-09-24 19:17:06 +0200 |
| commit | cd72a243af5c3ad7343d06e0c83a27088f9749ad (patch) | |
| tree | b982b1747d7dcc2fc04210010789192cfb364213 | |
| parent | 8c761b2877449692f799d3c45643b2c8d8bd4d40 (diff) | |
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)
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index c1e7ec2fa6c..21ea55aba09 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 |