diff options
| -rw-r--r-- | src/game/SpellHandler.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp index 8c3300993b9..b98d693c416 100644 --- a/src/game/SpellHandler.cpp +++ b/src/game/SpellHandler.cpp @@ -341,11 +341,6 @@ void WorldSession::HandleCancelCastOpcode(WorldPacket& recvPacket) { CHECK_PACKET_SIZE(recvPacket,5); - // ignore for remote control state (for player case) - Unit* mover = _player->m_mover; - if(mover != _player && mover->GetTypeId()==TYPEID_PLAYER) - return; - // increments with every CANCEL packet, don't use for now uint8 counter; uint32 spellId; @@ -356,18 +351,14 @@ void WorldSession::HandleCancelCastOpcode(WorldPacket& recvPacket) if(spellId==26679) return; - if(mover->IsNonMeleeSpellCasted(false)) - mover->InterruptNonMeleeSpells(false,spellId); + if(_player->IsNonMeleeSpellCasted(false)) + _player->InterruptNonMeleeSpells(false,spellId); } void WorldSession::HandleCancelAuraOpcode( WorldPacket& recvPacket) { CHECK_PACKET_SIZE(recvPacket,4); - // ignore for remote control state - if(_player->m_mover != _player) - return; - uint32 spellId; recvPacket >> spellId; @@ -396,10 +387,6 @@ void WorldSession::HandlePetCancelAuraOpcode( WorldPacket& recvPacket) { CHECK_PACKET_SIZE(recvPacket, 8+4); - // ignore for remote control state - if(_player->m_mover != _player) - return; - uint64 guid; uint32 spellId; @@ -447,7 +434,7 @@ void WorldSession::HandleCancelAutoRepeatSpellOpcode( WorldPacket& /*recvPacket* { // may be better send SMSG_CANCEL_AUTO_REPEAT? // cancel and prepare for deleting - _player->m_mover->InterruptSpell(CURRENT_AUTOREPEAT_SPELL); + _player->InterruptSpell(CURRENT_AUTOREPEAT_SPELL); } /// \todo Complete HandleCancelChanneling function |