diff options
author | joschiwald <joschiwald.trinity@gmail.com> | 2016-04-13 20:47:57 +0200 |
---|---|---|
committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-01-12 03:36:32 +0100 |
commit | 71ffdccb5a090523bd41bc24c2d457c7a3e68ccb (patch) | |
tree | a678a2a873b3a740b40ee2fd0c01f90a51babf33 /src/server/game/Movement/MotionMaster.cpp | |
parent | c4967d67bdbec5b15905ce2b41d949356abfedfa (diff) |
Core/Movement: enable item use and spell cast when dismounting
Remove error message and allow spell cast or item use from
mounted state on ground, especially when sitting on
a landed flying mount. Current behavior is that the player
will get the error message "You can't do that while moving"
when trying to cast a spell or pick up an item
while sitting on a flying mount after having landed.
By joschiwald, closes #6236
(cherry picked from commit 19aac66bc262a835cae288fc3d0ccdc8e93d0fb9)
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
-rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index af9fb9b5f6e..94dcd71b5d5 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -473,8 +473,11 @@ void MotionMaster::MoveFall(uint32 id /*=0*/) if (std::fabs(_owner->GetPositionZ() - tz) < 0.1f) return; + _owner->SetFall(true); + + // don't run spline movement for players if (_owner->GetTypeId() == TYPEID_PLAYER) - _owner->SetFall(true); + return; Movement::MoveSplineInit init(_owner); init.MoveTo(_owner->GetPositionX(), _owner->GetPositionY(), tz, false); |