*Fix arcane charge.

*SetInCombatWith in dozoneincombat.

--HG--
branch : trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp
index ca7dc435b09..b3fd3723466 100644
--- a/src/bindings/scripts/include/sc_creature.cpp
+++ b/src/bindings/scripts/include/sc_creature.cpp
@@ -671,9 +671,15 @@ void ScriptedAI::DoZoneInCombat(Unit* pUnit)
 
     Map::PlayerList const &PlayerList = map->GetPlayers();
     for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+    {
         if (Player* i_pl = i->getSource())
             if (!i_pl->isAlive())
+            {
+                pUnit->SetInCombatWith(i_pl);
+                i_pl->SetInCombatWith(pUnit);
                 pUnit->AddThreat(i_pl, 0.0f);
+            }
+    }
 }
 
 void ScriptedAI::DoResetThreat()