From 9880b20b32505c1cca1b231cca4556fed2173e6b Mon Sep 17 00:00:00 2001
From: ArashGorge <52334511+ArashGorge@users.noreply.github.com>
Date: Thu, 29 Aug 2019 01:15:48 +0430
Subject: [PATCH] fix(Core/Dungeon): Scourgelord Tyrannus died mid-air. Body
 got stuck mid-air and can't be looted (#2209)

---
 .../FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
index a0a2c84c3..1f4ebae51 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
@@ -62,6 +62,7 @@ public:
 
         void Reset()
         {
+            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             events.Reset();
             if (me->HasReactState(REACT_AGGRESSIVE)) // Reset() called by EnterEvadeMode()
             {
@@ -92,7 +93,6 @@ public:
             if (param == 1)
             {
                 Position exitPos = {1023.46f, 159.12f, 628.2f, 5.23f};
-                me->RemoveAllAuras();
                 if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_RIMEFANG_GUID)))
                 {
                     c->RemoveAura(46598);
@@ -103,6 +103,8 @@ public:
                 me->GetMotionMaster()->MoveJump(exitPos, 10.0f, 2.0f);
 
                 // start real fight
+                me->RemoveAllAuras();
+                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 DoZoneInCombat();
                 me->CastSpell(me, 43979, true);
                 Talk(SAY_AGGRO);