From 913f0903a3264f14ea44356bc86dade81348a546 Mon Sep 17 00:00:00 2001
From: Artamedes <ownedned123@gmail.com>
Date: Thu, 5 Sep 2019 02:37:44 -0400
Subject: Scripts/Outland: Fix npc_ancestral_wolf not starting waypoint
 (#23763)

* Scripts/Outlands: Fix npc_ancestral_wolf not starting waypoint, and also add a way to not follow owner automatically in CreatureAI::JustAppeared() for tempsummons

* fix nopch

(cherry picked from commit 0b3a9e2a2b2537e7224d103947ad6028c6d2e5fe)
---
 .../scripts/Outland/zone_hellfire_peninsula.cpp    | 28 ++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'src/server/scripts')

diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
index 9e9df90c9d6..0cac96a64b5 100644
--- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
@@ -38,6 +38,7 @@ EndContentData */
 #include "Player.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
+#include "TemporarySummon.h"
 
 /*######
 ## npc_aeranas
@@ -152,15 +153,21 @@ public:
 
     struct npc_ancestral_wolfAI : public EscortAI
     {
-        npc_ancestral_wolfAI(Creature* creature) : EscortAI(creature)
+        npc_ancestral_wolfAI(Creature* creature) : EscortAI(creature) { }
+
+        void InitializeAI() override
         {
-            if (creature->GetOwner() && creature->GetOwner()->GetTypeId() == TYPEID_PLAYER)
-                Start(false, false, creature->GetOwner()->GetGUID());
+            if (me->GetOwner() && me->GetOwner()->GetTypeId() == TYPEID_PLAYER)
+            {
+                EscortAI::Start(false, false, me->GetOwner()->GetGUID());
+
+                me->SetSpeedRate(MOVE_WALK, 1.5f);
+
+                if (auto tempSummon = me->ToTempSummon())
+                    tempSummon->SetCanFollowOwner(false);
+            }
             else
                 TC_LOG_ERROR("scripts", "TRINITY: npc_ancestral_wolf can not obtain owner or owner is not a player.");
-
-            creature->SetSpeedRate(MOVE_WALK, 1.5f);
-            Reset();
         }
 
         void Reset() override
@@ -187,33 +194,31 @@ public:
                     break;
                 // Move Ryga into position
                 case 48:
-                    if (Creature* ryga = me->FindNearestCreature(NPC_RYGA,70))
+                    if (Creature* ryga = me->FindNearestCreature(NPC_RYGA, 70.0f))
                     {
                         if (ryga->IsAlive() && !ryga->IsInCombat())
                         {
                             ryga->SetWalk(true);
                             ryga->SetSpeedRate(MOVE_WALK, 1.5f);
                             ryga->GetMotionMaster()->MovePoint(0, 517.340698f, 3885.03975f, 190.455978f, true);
-                            Reset();
                         }
                     }
                     break;
                 // Ryga Kneels and welcomes spirit wolf
                 case 50:
-                    if (Creature* ryga = me->FindNearestCreature(NPC_RYGA,70))
+                    if (Creature* ryga = me->FindNearestCreature(NPC_RYGA, 70.0f))
                     {
                         if (ryga->IsAlive() && !ryga->IsInCombat())
                         {
                             ryga->SetFacingTo(0.776773f);
                             ryga->SetStandState(UNIT_STAND_STATE_KNEEL);
                             ryga->AI()->Talk(SAY_WOLF_WELCOME);
-                            Reset();
                         }
                     }
                     break;
                 // Ryga returns to spawn point
                 case 51:
-                    if (Creature* ryga = me->FindNearestCreature(NPC_RYGA,70))
+                    if (Creature* ryga = me->FindNearestCreature(NPC_RYGA, 70.0f))
                     {
                         if (ryga->IsAlive() && !ryga->IsInCombat())
                         {
@@ -222,7 +227,6 @@ public:
                             ryga->SetHomePosition(fRetX, fRetY, fRetZ, fRetO);
                             ryga->SetStandState(UNIT_STAND_STATE_STAND);
                             ryga->GetMotionMaster()->MoveTargetedHome();
-                            Reset();
                         }
                     }
                     break;
-- 
cgit v1.2.3