From f4cc76063f5c19773e25eaac9bd3975828c4cc47 Mon Sep 17 00:00:00 2001 From: Treeston Date: Mon, 12 Feb 2018 03:25:05 +0100 Subject: Core/AI: EscortAI init logic moved from JustAppeared to InitializeAI. There are no escort NPCs using compatibility mode anymore, so this is equivalent. As a result, inheriting scripts calling Start in on-create hooks (like JustSummoned) will now work properly again. Tagging #20310. (cherry picked from commit e4e6e2209c8ad6cc534460a4ec9f6da469761d15) --- src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 4 +--- src/server/game/AI/ScriptedAI/ScriptedEscortAI.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/server/game/AI/ScriptedAI') diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index bcdf801075c..bb118886b79 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -69,7 +69,7 @@ void EscortAI::JustDied(Unit* /*killer*/) } } -void EscortAI::JustAppeared() +void EscortAI::InitializeAI() { _escortState = STATE_ESCORT_NONE; @@ -81,8 +81,6 @@ void EscortAI::JustAppeared() if (me->GetFaction() != me->GetCreatureTemplate()->faction) me->RestoreFaction(); - - Reset(); } void EscortAI::ReturnToLastPoint() diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h index fe8f6eb37fb..69bd4b5f6f3 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h @@ -39,9 +39,9 @@ struct TC_GAME_API EscortAI : public ScriptedAI explicit EscortAI(Creature* creature); ~EscortAI() { } + void InitializeAI() override; void MoveInLineOfSight(Unit* who) override; void JustDied(Unit*) override; - void JustAppeared() override; void ReturnToLastPoint(); void EnterEvadeMode(EvadeReason /*why*/ = EVADE_REASON_OTHER) override; void MovementInform(uint32, uint32) override; -- cgit v1.2.3