aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Movement/MotionMaster.cpp
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2016-04-13 20:47:57 +0200
committertkrokli <tkrokli@hotmail.com>2016-06-03 17:38:01 +0200
commit19aac66bc262a835cae288fc3d0ccdc8e93d0fb9 (patch)
tree5f0557308507f60acfd6a7f0091c39834c05b775 /src/server/game/Movement/MotionMaster.cpp
parentb253b694ed2ef8ee57a1c046ab80814a9a8aaa9b (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
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
-rw-r--r--src/server/game/Movement/MotionMaster.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 6f7dae1d4f2..d2059886f40 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -479,11 +479,12 @@ void MotionMaster::MoveFall(uint32 id /*=0*/)
if (std::fabs(_owner->GetPositionZ() - tz) < 0.1f)
return;
+ _owner->AddUnitMovementFlag(MOVEMENTFLAG_FALLING);
+ _owner->m_movementInfo.SetFallTime(0);
+
+ // don't run spline movement for players
if (_owner->GetTypeId() == TYPEID_PLAYER)
- {
- _owner->AddUnitMovementFlag(MOVEMENTFLAG_FALLING);
- _owner->m_movementInfo.SetFallTime(0);
- }
+ return;
Movement::MoveSplineInit init(_owner);
init.MoveTo(_owner->GetPositionX(), _owner->GetPositionY(), tz, false);