diff options
| author | Shocker <shocker@freakz.ro> | 2018-10-13 12:11:07 +0300 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2018-10-13 12:11:07 +0300 |
| commit | 937d6b1e6f286ab49048573188a0ba970e3e6bbe (patch) | |
| tree | fd051dbe69e8e111da4aac4fa739436afe4a3b8e /src | |
| parent | 865eb1733c040d6fda3ee8efe70406121f08e836 (diff) | |
Core/Spells: Implement AURA_INTERRUPT_FLAG_JUMP
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/Handlers/MovementHandler.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.h | 2 |
3 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 f956d970992..becf3dfcbea 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -5883,7 +5883,6 @@ bool Player::UpdatePosition(float x, float y, float z, float orientation, bool t // mover->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MOVE); //if (movementInfo.flags & MOVEMENTFLAG_TURNING) // mover->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TURNING); - //AURA_INTERRUPT_FLAG_JUMP not sure // group update if (GetGroup()) diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 99828a84c46..021e8246615 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -439,6 +439,9 @@ void WorldSession::HandleMovementOpcode(OpcodeClient opcode, MovementInfo& movem } else plrMover->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_IS_OUT_OF_BOUNDS); + + if (opcode == CMSG_MOVE_JUMP) + plrMover->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_JUMP, 605); // Mind Control } } diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index dcbcaeed397..2eb285b48ae 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -225,7 +225,7 @@ enum SpellAuraInterruptFlags : uint32 AURA_INTERRUPT_FLAG_CAST = 0x00000004, // 2 cast any spells AURA_INTERRUPT_FLAG_MOVE = 0x00000008, // 3 removed by any movement AURA_INTERRUPT_FLAG_TURNING = 0x00000010, // 4 removed by any turning - AURA_INTERRUPT_FLAG_JUMP = 0x00000020, // 5 removed by entering combat + AURA_INTERRUPT_FLAG_JUMP = 0x00000020, // 5 removed by jumping AURA_INTERRUPT_FLAG_NOT_MOUNTED = 0x00000040, // 6 removed by dismounting AURA_INTERRUPT_FLAG_NOT_ABOVEWATER = 0x00000080, // 7 removed by entering water AURA_INTERRUPT_FLAG_NOT_UNDERWATER = 0x00000100, // 8 removed by leaving water |