From 184c45cfe0fbe4f3e4fb701f0f99994df98bdc8a Mon Sep 17 00:00:00 2001
From: Treeston <treeston.mmoc@gmail.com>
Date: Sun, 6 Aug 2017 16:07:15 +0200
Subject: Core/Scripts: dynamic_spawning follow-up, I had forgotten
 JustRespawned existed.

- Rename JustRespawned to JustAppeared, which better matches its behavior anyway.
- Properly invoke JustAppeared for new (re-)spawns - fixes #20111.
- Fix Thaddius script to work with dynamic_spawning (mostly unrelated to the above) - Feugen/Stalagg should really be a summon group, but I don't have time to fix that right now.
- Fix default value for DynamicEscortNPC to match worldserver.conf.dist.
---
 src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp | 2 +-
 src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp  | 2 +-
 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp  | 2 +-
 src/server/scripts/EasternKingdoms/zone_hinterlands.cpp             | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/server/scripts/EasternKingdoms')

diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
index f0edc7af0c7..b58fc0b8d8e 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
@@ -107,7 +107,7 @@ class npc_av_marshal_or_warmaster : public CreatureScript
                 events.ScheduleEvent(EVENT_CHECK_RESET, 5000);
             }
 
-            void JustRespawned() override
+            void JustAppeared() override
             {
                 Reset();
             }
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
index cf034ed0ece..ed97d7670a1 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
@@ -71,7 +71,7 @@ public:
             events.ScheduleEvent(EVENT_RANDOM_YELL, urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS)); //20 to 30 seconds
         }
 
-        void JustRespawned() override
+        void JustAppeared() override
         {
             Reset();
             Talk(SAY_RESPAWN);
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
index 88254211099..c58b8afac7a 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
@@ -186,7 +186,7 @@ public:
             Talk(YELL_KILL);
         }
 
-        void JustRespawned() override
+        void JustAppeared() override
         {
             Talk(YELL_BIRTH);
         }
diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
index af79fd66ea5..fd5da36ecc8 100644
--- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
@@ -188,12 +188,12 @@ public:
             Initialize();
         }
 
-        void JustRespawned() override
+        void JustAppeared() override
         {
             _IsByOutrunner = false;
             spawnId = 0;
 
-            npc_escortAI::JustRespawned();
+            npc_escortAI::JustAppeared();
         }
 
         void EnterCombat(Unit* who) override
-- 
cgit v1.2.3