From 2d43b8aaa32bf75a40d7fa92eafda7eb87258c22 Mon Sep 17 00:00:00 2001
From: Killyana <morphone1@gmail.com>
Date: Sun, 28 Jan 2018 15:15:50 +0100
Subject: Quest/script: Freedom to Ruul

Follows https://github.com/TrinityCore/TrinityCore/commit/4dc91429dd2158c75679d07c34a18a2e12b4ef7a

(cherry picked from commit 52fc5a572b037a9aee084be7f5bcc9bb7d84c0e9)
---
 src/server/scripts/Kalimdor/zone_ashenvale.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
index 23b8f82b67f..1fa4f1c08c5 100644
--- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
@@ -116,6 +116,7 @@ public:
                     me->SummonCreature(NPC_THISTLEFUR_PATHFINDER, RuulSnowhoofSummonsCoord[5], TEMPSUMMON_DEAD_DESPAWN, 60000);
                     break;
                 case 27:
+                    me->SetFaction(me->GetCreatureTemplate()->faction);
                     me->RemoveAurasDueToSpell(RUUL_SHAPECHANGE);
                     Talk(SAY_FINISH, player);
                     player->GroupEventHappens(QUEST_FREEDOM_TO_RUUL, me);
@@ -127,6 +128,13 @@ public:
         {
             EscortAI::UpdateAI(diff);
         }
+
+        void EnterEvadeMode(EvadeReason why) override
+        {
+            if (!me->HasAura(RUUL_SHAPECHANGE))
+                me->AddAura(RUUL_SHAPECHANGE, me);
+            ScriptedAI::EnterEvadeMode(why);
+        }
     };
 
     CreatureAI* GetAI(Creature* creature) const override
-- 
cgit v1.2.3