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

[11597] Fixed detection part triggering of spell 17767 and ranks.

Browse source 
Also in Unit::IsTriggeredAtSpellProcEvent allow triggering by
spell with custom flag PROC_FLAG_ON_TAKE_PERIODIC
This commit is contained in:
VladimirMangos 2011-06-04 19:35:10 +04:00
parent cae9e9c29f
commit 35bac6976c
5 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/game/UnitAuraProcHandler.cpp
View file

@ -384,7 +384,7 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, SpellAuraHolder* holder, S
}
// Aura added by spell can`t trigger from self (prevent drop charges/do triggers)
// But except periodic triggers (can triggered from self)
if(procSpell && procSpell->Id == spellProto->Id && !(spellProto->procFlags & PROC_FLAG_ON_TAKE_PERIODIC))
if(procSpell && procSpell->Id == spellProto->Id && !(EventProcFlag & PROC_FLAG_ON_TAKE_PERIODIC))
return false;
// Check if current equipment allows aura to proc
@ -3038,7 +3038,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
case SPELLFAMILY_WARLOCK:
{
// Drain Soul
if (auraSpellInfo->SpellFamilyFlags & UI64LIT(0x0000000000004000))
if (auraSpellInfo->IsFitToFamilyMask(UI64LIT(0x0000000000004000)))
{
// search for "Improved Drain Soul" dummy aura
Unit::AuraList const& mDummyAura = GetAurasByType(SPELL_AURA_DUMMY);
@ -3056,6 +3056,13 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
// Need for correct work Drain Soul SPELL_AURA_CHANNEL_DEATH_ITEM aura
return SPELL_AURA_PROC_FAILED;
}
// Consume Shadows
else if (auraSpellInfo->IsFitToFamilyMask(UI64LIT(0x0000000002000000)))
{
Aura* heal = triggeredByAura->GetHolder()->GetAuraByEffectIndex(EFFECT_INDEX_0);
if (!heal || heal->GetAuraTicks() > 1)
return SPELL_AURA_PROC_FAILED;
}
// Nether Protection
else if (auraSpellInfo->SpellIconID == 1985)
{