diff options
| -rw-r--r-- | sql/FULL/world_scripts_full.sql | 4 | ||||
| -rw-r--r-- | sql/updates/5761_world_scripts.sql | 5 | ||||
| -rw-r--r-- | src/game/Creature.cpp | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql index 30d5d4eb05b..e782ecdd0bb 100644 --- a/sql/FULL/world_scripts_full.sql +++ b/sql/FULL/world_scripts_full.sql @@ -521,12 +521,14 @@ UPDATE `instance_template` SET `script`='instance_gundrak' WHERE `map`=604; UPDATE `creature_template` SET `ScriptName`='boss_moorabi' WHERE `entry`=29305; /* Slad'ran */ 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; /* Gal'darah */ UPDATE `creature_template` SET `ScriptName`='boss_gal_darah' WHERE `entry`=29306; /* Drakkari Colossus */ 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`=192519; diff --git a/sql/updates/5761_world_scripts.sql b/sql/updates/5761_world_scripts.sql new file mode 100644 index 00000000000..7733b84e1dd --- /dev/null +++ b/sql/updates/5761_world_scripts.sql @@ -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; diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index b361f949237..4aa4c48ffe8 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -544,8 +544,8 @@ void Creature::Update(uint32 diff) if(!isAlive()) break; - bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || getVictim() == NULL || - (getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() != NULL && + bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || getThreatManager().isThreatListEmpty() || + (getVictim() && getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() && getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster())); if(m_regenTimer > diff && !bNotInCombatOrIsPolymorphed) |