*Merge.

--HG--
branch : trunk

1 files changed, 7 insertions, 2 deletions

diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp
index 1af12bedc02..a78dfc09373 100644
--- a/src/game/ThreatManager.cpp
+++ b/src/game/ThreatManager.cpp
@@ -372,10 +372,15 @@ void ThreatManager::addThreat(Unit* pVictim, float pThreat, SpellSchoolMask scho
     {
         float reducedThreat = threat * pVictim->GetReducedThreatPercent() / 100;
         threat -= reducedThreat;
-        if(pVictim->GetMisdirectionTarget())
-            iThreatContainer.addThreat(pVictim->GetMisdirectionTarget(), reducedThreat);
+        if(Unit *unit = pVictim->GetMisdirectionTarget())
+            _addThreat(unit, reducedThreat);
     }
 
+    _addThreat(pVictim, threat);
+}
+
+void ThreatManager::_addThreat(Unit *pVictim, float threat)
+{
     HostilReference* ref = iThreatContainer.addThreat(pVictim, threat);
     // Ref is not in the online refs, search the offline refs next
     if(!ref)