aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorelecyb <elecyb@hotmail.com>2016-06-18 14:55:48 +0200
committerjoschiwald <joschiwald.trinity@gmail.com>2017-01-29 21:51:06 +0100
commit58c660f4e4f8d01ce03cbd475ceb1412744f276f (patch)
treeb75f4e4ac1c6d9e8832a85db2abfc22587fdaa05 /src
parent91aaf95f5190dfc7ad28b48b62ac7301e840ccbd (diff)
Core/Player: Fix ghost players water walking visual bug
Fix bug of ghost players appearing as swimming to other players instead of water walking. Ref #16256 (cherry picked from commit f8e87a445a3a959c1cace36f1f72efeb2707161f) # Conflicts: # src/server/game/Server/WorldSession.cpp
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 2f6838ba73e..e37666bf057 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -26953,8 +26953,10 @@ void Player::ValidateMovementInfo(MovementInfo* mi)
REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_FORWARD) && mi->HasMovementFlag(MOVEMENTFLAG_BACKWARD),
MOVEMENTFLAG_FORWARD | MOVEMENTFLAG_BACKWARD);
- //! Cannot walk on water without SPELL_AURA_WATER_WALK
- REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_WATERWALKING) && !HasAuraType(SPELL_AURA_WATER_WALK),
+ //! Cannot walk on water without SPELL_AURA_WATER_WALK except for ghosts
+ REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_WATERWALKING) &&
+ !HasAuraType(SPELL_AURA_WATER_WALK) &&
+ !HasAuraType(SPELL_AURA_GHOST),
MOVEMENTFLAG_WATERWALKING);
//! Cannot feather fall without SPELL_AURA_FEATHER_FALL