From 9da5e850f63fef2ae44739350a4771930e98cfda Mon Sep 17 00:00:00 2001
From: Wyrserth <wyrserth@protonmail.com>
Date: Sat, 3 Aug 2019 09:33:50 +0200
Subject: [PATCH] Script/Hyjal: prevent Archimode from attacking players while
 invisible, and fix his scale (thanks Killyana!).

Closes #16424.
---
 sql/updates/world/3.3.5/2019_08_03_00_world.sql               | 2 ++
 .../CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp      | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 sql/updates/world/3.3.5/2019_08_03_00_world.sql

diff --git a/sql/updates/world/3.3.5/2019_08_03_00_world.sql b/sql/updates/world/3.3.5/2019_08_03_00_world.sql
new file mode 100644
index 00000000000..f71e3fc19da
--- /dev/null
+++ b/sql/updates/world/3.3.5/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 e28ed3eabb9..261a299cef0 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)
                             {