Changeset 106 for trunk/src/bindings/scripts/include/sc_creature.cpp

Timestamp:

11/19/08 13:36:29 (17 years ago)

Author:

yumileroy

Message:

[svn] Fix a crash caused by gruul script.
Change in EffectSummonWild? and DoZoneInCombat?.

Original author: megamage
Date: 2008-10-24 17:37:40-05:00

Files:

• trunk/src/bindings/scripts/include/sc_creature.cpp (modified) (2 diffs)

trunk/src/bindings/scripts/include/sc_creature.cpp

@@ -459 +459 @@
     }
 
-    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;
-    }
+        return;
+    }*/
 
     InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
@@ -470 +469 @@
     for (i = PlayerList.begin(); i != PlayerList.end(); ++i)
     {
-        if(!(*i)->isGameMaster())
+        if((*i)->isAlive())
             pUnit->AddThreat(*i, 0.0f);
     }