mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow cancel mind control spells while control target.

Browse source
This commit is contained in:
VladimirMangos 2009-07-07 00:05:20 +04:00
parent 38197b539f
commit 0b9e41332c
1 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/game/SpellHandler.cpp
View file

@ -27,6 +27,7 @@
#include "Spell.h" #include "Spell.h"
#include "ScriptCalls.h" #include "ScriptCalls.h"
#include "Totem.h" #include "Totem.h"
#include "SpellAuras.h"
void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
{ {
@ -377,10 +378,6 @@ void WorldSession::HandleCancelAuraOpcode( WorldPacket& recvPacket)
{ {
CHECK_PACKET_SIZE(recvPacket,4); CHECK_PACKET_SIZE(recvPacket,4);
// ignore for remote control state
if(_player->m_mover != _player)
return;
uint32 spellId; uint32 spellId;
recvPacket >> spellId; recvPacket >> spellId;
@ -388,10 +385,34 @@ void WorldSession::HandleCancelAuraOpcode( WorldPacket& recvPacket)
if (!spellInfo) if (!spellInfo)
return; return;
// not allow remove non positive spells and spells with attr SPELL_ATTR_CANT_CANCEL if (spellInfo->Attributes & SPELL_ATTR_CANT_CANCEL)
if(!IsPositiveSpell(spellId) || (spellInfo->Attributes & SPELL_ATTR_CANT_CANCEL))
return; return;
if(!IsPositiveSpell(spellId))
{
// ignore for remote control state
if (_player->m_mover != _player)
{
// except own aura spells
bool allow = false;
for(int k = 0; k < 3; ++k)
{
if (spellInfo->EffectApplyAuraName[k] == SPELL_AURA_MOD_POSSESS ||
spellInfo->EffectApplyAuraName[k] == SPELL_AURA_MOD_POSSESS_PET)
{
allow = true;
break;
}
}
// this also include case when aura not found
if(!allow)
return;
}
else
return;
}
// channeled spell case (it currently casted then) // channeled spell case (it currently casted then)
if (IsChanneledSpell(spellInfo)) if (IsChanneledSpell(spellInfo))
{ {