josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Instead of checking getVictim() to determine whether or not to regen health, check if the threat list is empty

Browse Source 
*Fix some incorrect/missing scriptname assignments, thanks Drahy

--HG--
branch : trunk
This commit is contained in:
maximius
2009-09-26 21:55:47 -07:00
parent de45e93689
commit 342b071d47
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/FULL/world_scripts_full.sql
+3 -1
View File
@@ -521,12 +521,14 @@ UPDATE `instance_template` SET `script`='instance_gundrak' WHERE `map`=604;
UPDATE `creature_template` SET `ScriptName`='boss_moorabi' WHERE `entry`=29305; UPDATE `creature_template` SET `ScriptName`='boss_moorabi' WHERE `entry`=29305;
/* Slad'ran */ /* Slad'ran */
UPDATE `creature_template` SET `ScriptName`='boss_slad_ran' WHERE `entry`=29304; UPDATE `creature_template` SET `ScriptName`='boss_slad_ran' WHERE `entry`=29304;
UPDATE `creature_template` SET `ScriptName`='mob_slad_ran_viper' WHERE `entry`=29304; UPDATE `creature_template` SET `ScriptName`='mob_slad_ran_viper' WHERE `entry`=29680;
UPDATE `creature_template` SET `ScriptName`='mob_slad_ran_constrictor' WHERE `entry`=29713; UPDATE `creature_template` SET `ScriptName`='mob_slad_ran_constrictor' WHERE `entry`=29713;
/* Gal'darah */ /* Gal'darah */
UPDATE `creature_template` SET `ScriptName`='boss_gal_darah' WHERE `entry`=29306; UPDATE `creature_template` SET `ScriptName`='boss_gal_darah' WHERE `entry`=29306;
/* Drakkari Colossus */ /* Drakkari Colossus */
UPDATE `creature_template` SET `ScriptName`='boss_drakkari_colossus' WHERE `entry`=29307; UPDATE `creature_template` SET `ScriptName`='boss_drakkari_colossus' WHERE `entry`=29307;
/* Eck the Ferocious */
UPDATE `creature_template` SET `ScriptName`='boss_eck' WHERE `entry`=29932;
UPDATE `gameobject_template` SET `ScriptName`='go_gundrak_altar' WHERE `entry`=192518; UPDATE `gameobject_template` SET `ScriptName`='go_gundrak_altar' WHERE `entry`=192518;
UPDATE `gameobject_template` SET `ScriptName`='go_gundrak_altar' WHERE `entry`=192519; UPDATE `gameobject_template` SET `ScriptName`='go_gundrak_altar' WHERE `entry`=192519;
sql/updates/5761_world_scripts.sql
+5
View File
@@ -0,0 +1,5 @@
UPDATE `creature_template` SET `ScriptName`='mob_slad_ran_viper' WHERE `entry`=29680;
/* Eck the Ferocious */
UPDATE `creature_template` SET `ScriptName`='boss_eck' WHERE `entry`=29932;
src/game/Creature.cpp
+2 -2
View File
@@ -544,8 +544,8 @@ void Creature::Update(uint32 diff)
if(!isAlive()) if(!isAlive())
break; break;
bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || getVictim() == NULL || bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || getThreatManager().isThreatListEmpty() ||
(getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() != NULL && (getVictim() && getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() &&
getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster())); getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster()));
if(m_regenTimer > diff && !bNotInCombatOrIsPolymorphed) if(m_regenTimer > diff && !bNotInCombatOrIsPolymorphed)