diff options
| author | Brian <runningnak3d@gmail.com> | 2010-07-02 06:06:40 -0600 |
|---|---|---|
| committer | Brian <runningnak3d@gmail.com> | 2010-07-02 06:06:40 -0600 |
| commit | a52233f40eaed23623b8a4be93d9b513997f0f53 (patch) | |
| tree | ac1bfc0056981b1f79067253f14bd5302247778f /src/server/game/Combat/ThreatManager.cpp | |
| parent | baf108e5ccc0ee42efcefa4a87e2784421df15c5 (diff) | |
| parent | e0e36b5db5777a08660d1c2c243afd8f60b49a43 (diff) | |
* Merge public repo
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Combat/ThreatManager.cpp')
| -rw-r--r-- | src/server/game/Combat/ThreatManager.cpp | 5 |
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); } |