server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed azuregos's spell. Thanks mpfans

Browse Source
This commit is contained in:
Antz 2016-09-10 21:51:40 +01:00
parent 7dcdcdd9ba
commit 3ecb228871
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/game/Object/SpellMgr.cpp
View File

@ -2009,6 +2009,11 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
(spellInfo_2->Id == 21992 && spellInfo_1->Id == 27648)) (spellInfo_2->Id == 21992 && spellInfo_1->Id == 27648))
{ return false; } { return false; }
// Mark of Frost
if ((spellInfo_1->Id == 23182 && spellInfo_2->Id == 23183) ||
(spellInfo_2->Id == 23182 && spellInfo_1->Id == 23183))
{ return false; }
// Lightning Speed (Mongoose) and Fury of the Crashing Waves (Tsunami Talisman) // Lightning Speed (Mongoose) and Fury of the Crashing Waves (Tsunami Talisman)
if ((spellInfo_1->Id == 28093 && spellInfo_2->Id == 42084) || if ((spellInfo_1->Id == 28093 && spellInfo_2->Id == 42084) ||
(spellInfo_2->Id == 28093 && spellInfo_1->Id == 42084)) (spellInfo_2->Id == 28093 && spellInfo_1->Id == 42084))
@ -2273,6 +2278,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
if (spellInfo_2->Id == 132 && spellInfo_1->IsFitToFamilyMask(0x0000000000008000)) if (spellInfo_2->Id == 132 && spellInfo_1->IsFitToFamilyMask(0x0000000000008000))
{ return false; } { return false; }
// Ice Block and Mark of Frost
if (spellInfo_2->Id == 23182 && spellInfo_1->Id == 11958)
{ return true; }
// Arcane Intellect and Insight // Arcane Intellect and Insight
// Code refactoring // Code refactoring
if (spellInfo_1->IsFitToFamilyMask(0x0000000000000400) && spellInfo_2->Id == 18820) if (spellInfo_1->IsFitToFamilyMask(0x0000000000000400) && spellInfo_2->Id == 18820)

5
src/game/WorldHandlers/SpellEffects.cpp
View File

@ -827,8 +827,9 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
if (m_caster->GetThreatManager().getThreat(unitTarget)) if (m_caster->GetThreatManager().getThreat(unitTarget))
{ m_caster->GetThreatManager().modifyThreatPercent(unitTarget, -100); } { m_caster->GetThreatManager().modifyThreatPercent(unitTarget, -100); }
// cast summon player // cast summon player if not affected by Aura of Frost (23186)
m_caster->CastSpell(unitTarget, 21150, true); if (!unitTarget->HasAura(23186))
{ m_caster->CastSpell(unitTarget, 21150, true); }
return; return;
} }