diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellAuras.cpp | 11 | ||||
| -rw-r--r-- | src/game/ThreatManager.cpp | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 1b2e0f5b6fd..1b75ab75473 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -1320,6 +1320,17 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, // mods at aura apply or remove switch (GetSpellProto()->SpellFamilyName) { + case SPELLFAMILY_GENERIC: + switch(GetId()) + { + case 50720: // Vigilance + if (apply) + target->CastSpell(caster, 59665, true, 0, 0, caster->GetGUID()); + else + target->SetReducedThreatPercent(0,0); + break; + } + break; case SPELLFAMILY_ROGUE: // Stealth if (GetSpellProto()->SpellFamilyFlags[0] & 0x00400000) diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp index 3cf9f5d435d..d64cb96f510 100644 --- a/src/game/ThreatManager.cpp +++ b/src/game/ThreatManager.cpp @@ -384,9 +384,16 @@ void ThreatManager::addThreat(Unit* pVictim, float fThreat, SpellSchoolMask scho // must check > 0.0f, otherwise dead loop if (threat > 0.0f && pVictim->GetReducedThreatPercent()) { - float reducedThreat = threat * pVictim->GetReducedThreatPercent() / 100; + uint32 reducedThreadPercent = pVictim->GetReducedThreatPercent(); + + Unit *unit = pVictim->GetMisdirectionTarget(); + if (unit) + if (Aura* pAura = unit->GetAura(63326)) // Glyph of Vigilance + reducedThreadPercent += pAura->GetSpellProto()->EffectBasePoints[0]; + + float reducedThreat = threat * reducedThreadPercent / 100; threat -= reducedThreat; - if (Unit *unit = pVictim->GetMisdirectionTarget()) + if (unit) _addThreat(unit, reducedThreat); } |