[svn] Fix a crash caused by gruul script.

Change in EffectSummonWild and DoZoneInCombat.

--HG--
branch : trunk

1 files changed, 3 insertions, 4 deletions

diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp
index a5401b8100d..ee52817c114 100644
--- a/src/bindings/scripts/include/sc_creature.cpp
+++ b/src/bindings/scripts/include/sc_creature.cpp
@@ -458,18 +458,17 @@ void ScriptedAI::DoZoneInCombat(Unit* pUnit)
         return;
     }
 
-    if (!pUnit->CanHaveThreatList() || pUnit->getThreatManager().isThreatListEmpty())
+    /*if (!pUnit->CanHaveThreatList() || pUnit->getThreatManager().isThreatListEmpty())
     {
         error_log("SD2: DoZoneInCombat called for creature that either cannot have threat list or has empty threat list (pUnit entry = %d)", pUnit->GetTypeId() == TYPEID_UNIT ? ((Creature*)pUnit)->GetEntry() : 0);
-
         return;
-    }
+    }*/
 
     InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
     InstanceMap::PlayerList::const_iterator i;
     for (i = PlayerList.begin(); i != PlayerList.end(); ++i)
     {
-        if(!(*i)->isGameMaster())
+        if((*i)->isAlive())
             pUnit->AddThreat(*i, 0.0f);
     }
 }