Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not allow to proc spells if they can't stack with already active auras.

Browse Source 
this fixes 13048 and 12292.

--HG--
branch : trunk
This commit is contained in:
krz
2009-05-14 14:35:09 +02:00
parent bfaaa8201e
commit ee40287ef7
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/Unit.cpp
View File

@@ -6894,6 +6894,18 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
Item* castItem = triggeredByAura->GetCastItemGUID() && GetTypeId()==TYPEID_PLAYER
? ((Player*)this)->GetItemByGuid(triggeredByAura->GetCastItemGUID()) : NULL;
// check if triggering spell can stack with current target's auras (if not - don't proc)
AuraMap::iterator i,next;
for (i = m_Auras.begin(); i != m_Auras.end(); i = next)
{
next = i;
++next;
if (!(*i).second) continue;
if ( (*i).second->GetSpellProto()->Id == trigger_spell_id) continue;
if (spellmgr.IsNoStackSpellDueToSpell(trigger_spell_id, (*i).second->GetSpellProto()->Id, (pVictim == this)))
return false;
}
// Try handle uncnown trigger spells
if (sSpellStore.LookupEntry(trigger_spell_id)==NULL)
switch (auraSpellInfo->SpellFamilyName)