aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWyrserth <wyrserth@protonmail.com>2019-08-03 09:33:50 +0200
committerShauren <shauren.trinity@gmail.com>2021-12-18 00:11:44 +0100
commit75114dd82090857ca81d5c887e69722ae929b396 (patch)
tree9f5e0b281a7ef0ab6eba4b6e104edb9998429253
parent2f2de263114e1227e348a9177bf8b60076a17553 (diff)
Script/Hyjal: prevent Archimode from attacking players while invisible, and fix his scale (thanks Killyana!).
Closes #16424. (cherry picked from commit 9da5e850f63fef2ae44739350a4771930e98cfda)
-rw-r--r--sql/updates/world/master/2021_12_17_32_world_2019_08_03_00_world.sql2
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp4
2 files changed, 6 insertions, 0 deletions
diff --git a/sql/updates/world/master/2021_12_17_32_world_2019_08_03_00_world.sql b/sql/updates/world/master/2021_12_17_32_world_2019_08_03_00_world.sql
new file mode 100644
index 00000000000..f71e3fc19da
--- /dev/null
+++ b/sql/updates/world/master/2021_12_17_32_world_2019_08_03_00_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `scale`=1 WHERE `entry` =17968;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 9796c467438..ecef187428c 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -129,7 +129,10 @@ public:
case ARCHIMONDE:
Archimonde = creature->GetGUID();
if (GetData(DATA_AZGALOREVENT) != DONE)
+ {
creature->SetVisible(false);
+ creature->SetReactState(REACT_PASSIVE);
+ }
break;
case JAINA:
JainaProudmoore = creature->GetGUID();
@@ -183,6 +186,7 @@ public:
if (Creature* archimonde = instance->GetCreature(Archimonde))
{
archimonde->SetVisible(true);
+ archimonde->SetReactState(REACT_AGGRESSIVE);
if (!ArchiYell)
{