aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Unit
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2016-04-13 20:47:57 +0200
committerjoschiwald <joschiwald.trinity@gmail.com>2017-01-12 03:36:32 +0100
commit71ffdccb5a090523bd41bc24c2d457c7a3e68ccb (patch)
treea678a2a873b3a740b40ee2fd0c01f90a51babf33 /src/server/game/Entities/Unit
parentc4967d67bdbec5b15905ce2b41d949356abfedfa (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/Entities/Unit')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e4bede0cb06..2ff096d2d27 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -15257,14 +15257,9 @@ bool Unit::SetDisableGravity(bool disable)
{
AddUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY);
RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_SPLINE_ELEVATION);
- SetFall(false);
}
else
- {
RemoveUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY);
- if (!HasUnitMovementFlag(MOVEMENTFLAG_CAN_FLY))
- SetFall(true);
- }
static OpcodeServer const gravityOpcodeTable[2][2] =
{
@@ -15337,14 +15332,9 @@ bool Unit::SetCanFly(bool enable)
{
AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY);
RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_SPLINE_ELEVATION);
- SetFall(false);
}
else
- {
RemoveUnitMovementFlag(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_MASK_MOVING_FLY);
- if (!IsLevitating())
- SetFall(true);
- }
static OpcodeServer const flyOpcodeTable[2][2] =
{