From 1673915f96a3a70cd8558b800512ed787064495a Mon Sep 17 00:00:00 2001
From: Eddy Vega <61223313+Si1ker@users.noreply.github.com>
Date: Sat, 8 Jul 2023 22:40:46 -0600
Subject: [PATCH] fix(Scripts/HellfirePeninsula): Improve Wounded Blood Elf
 Pilgrim (#16566)

init
---
 .../scripts/Outland/zone_hellfire_peninsula.cpp       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
index effc40527..76d65a417 100644
--- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
@@ -234,7 +234,8 @@ enum WoundedBloodElf
     SAY_ELF_AGGRO               = 5,
     QUEST_ROAD_TO_FALCON_WATCH  = 9375,
     NPC_HAALESHI_WINDWALKER     = 16966,
-    NPC_HAALESHI_TALONGUARD     = 16967
+    NPC_HAALESHI_TALONGUARD     = 16967,
+    ARAKKOA_CAGE                = 181664
 };
 
 class npc_wounded_blood_elf : public CreatureScript
@@ -246,7 +247,11 @@ public:
     {
         npc_wounded_blood_elfAI(Creature* creature) : npc_escortAI(creature) { }
 
-        void Reset() override { }
+        void Reset() override
+        {
+            me->SetReactState(REACT_PASSIVE);
+            me->FindNearestGameObject(ARAKKOA_CAGE, 10.0f)->SetGoState(GO_STATE_READY);
+        }
 
         void JustEngagedWith(Unit* /*who*/) override
         {
@@ -263,6 +268,7 @@ public:
         {
             if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH)
             {
+                me->SetReactState(REACT_AGGRESSIVE);
                 me->SetFaction(FACTION_ESCORTEE_H_PASSIVE);
                 npc_escortAI::Start(true, false, player->GetGUID());
             }
@@ -278,6 +284,7 @@ public:
             {
                 case 0:
                     Talk(SAY_ELF_START, player);
+                    me->FindNearestGameObject(ARAKKOA_CAGE, 10.0f)->SetGoState(GO_STATE_ACTIVE);
                     break;
                 case 9:
                     Talk(SAY_ELF_SUMMON1, player);