josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Core/Spells: Fix manual cancel of mind control. closes #2676

Browse Source
This commit is contained in:
Chaplain
2011-09-03 17:29:56 +02:00
committed by QAston
parent 82e7b11df1
commit 79fb3d487e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Server/Protocol/Handlers/SpellHandler.cpp
+8 -7
View File
@@ -424,12 +424,8 @@ void WorldSession::HandleCancelAuraOpcode(WorldPacket& recvPacket)
if (!spellInfo) if (!spellInfo)
return; return;
// not allow remove non positive spells and spells with attr SPELL_ATTR0_CANT_CANCEL // not allow remove spells with attr SPELL_ATTR0_CANT_CANCEL
if (!spellInfo->IsPositive() || (spellInfo->Attributes & SPELL_ATTR0_CANT_CANCEL)) if (spellInfo->Attributes & SPELL_ATTR0_CANT_CANCEL)
return;
// don't allow cancelling passive auras (some of them are visible)
if (spellInfo->IsPassive())
return; return;
// channeled spell case (it currently casted then) // channeled spell case (it currently casted then)
@@ -441,7 +437,12 @@ void WorldSession::HandleCancelAuraOpcode(WorldPacket& recvPacket)
return; return;
} }
// non channeled case // non channeled case:
// don't allow remove non positive spells
// don't allow cancelling passive auras (some of them are visible)
if (!spellInfo->IsPositive() || spellInfo->IsPassive())
return;
// maybe should only remove one buff when there are multiple? // maybe should only remove one buff when there are multiple?
_player->RemoveOwnedAura(spellId, 0, 0, AURA_REMOVE_BY_CANCEL); _player->RemoveOwnedAura(spellId, 0, 0, AURA_REMOVE_BY_CANCEL);
} }