aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Combat/ThreatManager.cpp
diff options
context:
space:
mode:
authorShauren <none@none>2010-07-02 14:24:05 +0200
committerShauren <none@none>2010-07-02 14:24:05 +0200
commit255e7e8b83848f1e43baffe98e0df88ae5dd537f (patch)
tree3ca4effa78d689a4fff4a3c9aaebd6eae427cc9d /src/server/game/Combat/ThreatManager.cpp
parent3fd0fb8f97a54266677d6b76d30d1281bd9d9861 (diff)
Fixed Chain Lightning overproccing with Lightning Overload, patch by DrTenma
Closes issue #1198. --HG-- branch : trunk
Diffstat (limited to 'src/server/game/Combat/ThreatManager.cpp')
-rw-r--r--src/server/game/Combat/ThreatManager.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index 52f02f0f66d..fbf5a80d42b 100644
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@@ -36,8 +36,13 @@
float ThreatCalcHelper::calcThreat(Unit* pHatedUnit, Unit* /*pHatingUnit*/, float fThreat, SpellSchoolMask schoolMask, SpellEntry const *pThreatSpell)
{
if (pThreatSpell)
+ {
+ if (pThreatSpell->AttributesEx & SPELL_ATTR_EX_NO_THREAT)
+ return 0.0f;
+
if (Player* modOwner = pHatedUnit->GetSpellModOwner())
modOwner->ApplySpellMod(pThreatSpell->Id, SPELLMOD_THREAT, fThreat);
+ }
return pHatedUnit->ApplyTotalThreatModifier(fThreat, schoolMask);
}