diff --git a/src/game/HostileRefManager.cpp b/src/game/HostileRefManager.cpp index fef91c284..d849a7eee 100644 --- a/src/game/HostileRefManager.cpp +++ b/src/game/HostileRefManager.cpp @@ -44,26 +44,11 @@ void HostileRefManager::threatAssist(Unit *pVictim, float pThreat, SpellEntry co Unit* redirectedTarget = redirectedMod ? pVictim->getHostileRefManager().GetThreatRedirectionTarget() : NULL; uint32 size = pSingleTarget ? 1 : getSize(); // if pSingleTarget do not devide threat + float threat = pThreat/size; HostileReference* ref = getFirst(); - while(ref != NULL) + while (ref) { - float threat = ThreatCalcHelper::calcThreat(pVictim, iOwner, pThreat, false, (pThreatSpell ? GetSpellSchoolMask(pThreatSpell) : SPELL_SCHOOL_MASK_NORMAL), pThreatSpell); - - if (threat > 0.0f) - { - if (redirectedTarget && redirectedTarget != ref->getTarget() && redirectedTarget->isAlive()) - { - float redirectedThreat = threat * redirectedMod; - threat -= redirectedThreat; - - if(redirectedTarget == getOwner()) // It is faster to modify the threat durectly if possible - ref->addThreat(float (threat) / size); - else - ref->getSource()->addThreat(redirectedTarget, redirectedThreat); - } - } - - ref->getSource()->addThreat(pVictim, float (threat) / size); + ref->getSource()->addThreat(pVictim, threat, false, (pThreatSpell ? GetSpellSchoolMask(pThreatSpell) : SPELL_SCHOOL_MASK_NORMAL), pThreatSpell); ref = ref->next(); } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 07a23dd37..34525b0f4 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11010" + #define REVISION_NR "11011" #endif // __REVISION_NR_H__