mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
[7188] Drop now unneeded hack code.
This commit is contained in:
parent
de277ad917
commit
d4ce99dfa2
2 changed files with 46 additions and 77 deletions
|
|
@ -3535,40 +3535,10 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
|
|||
for(int j = 0; j < 3; ++j)
|
||||
if (i_spellProto->EffectTriggerSpell[j] == spellProto->Id)
|
||||
is_triggered_by_spell = true;
|
||||
if (is_triggered_by_spell) continue;
|
||||
|
||||
for(int j = 0; j < 3; ++j)
|
||||
{
|
||||
// prevent remove dummy triggered spells at next effect aura add
|
||||
switch(spellProto->Effect[j]) // main spell auras added added after triggered spell
|
||||
{
|
||||
case SPELL_EFFECT_DUMMY:
|
||||
switch(spellId)
|
||||
{
|
||||
case 5420: if(i_spellId==34123) is_triggered_by_spell = true; break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (is_triggered_by_spell)
|
||||
continue;
|
||||
|
||||
if(is_triggered_by_spell)
|
||||
break;
|
||||
|
||||
// prevent remove form main spell by triggered passive spells
|
||||
switch(i_spellProto->EffectApplyAuraName[j]) // main aura added before triggered spell
|
||||
{
|
||||
case SPELL_AURA_MOD_SHAPESHIFT:
|
||||
switch(i_spellId)
|
||||
{
|
||||
case 24858: if(spellId==24905) is_triggered_by_spell = true; break;
|
||||
case 33891: if(spellId==5420 || spellId==34123) is_triggered_by_spell = true; break;
|
||||
case 34551: if(spellId==22688) is_triggered_by_spell = true; break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(!is_triggered_by_spell)
|
||||
{
|
||||
SpellSpecific i_spellId_spec = GetSpellSpecific(i_spellId);
|
||||
|
||||
bool is_sspc = IsSingleFromSpellSpecificPerCaster(spellId_spec,i_spellId_spec);
|
||||
|
|
@ -3627,7 +3597,6 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "7187"
|
||||
#define REVISION_NR "7188"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue