From bad8390dee2fba50a711a26e6537fbdbb0d8863d Mon Sep 17 00:00:00 2001
From: ArashGorge <52334511+ArashGorge@users.noreply.github.com>
Date: Thu, 25 Jul 2019 12:25:21 +0430
Subject: [PATCH] fix(Core/Dungeon/Boss Script):  Halls of Stone - Brann
 Respawn - Naxxaramus Noth Teleport phase Bug - Ulduar StormcCaller Brundir
 inFly Die Bug (#2063)

---
 src/server/scripts/Northrend/Naxxramas/boss_noth.cpp        | 1 +
 .../Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp     | 6 ++++++
 .../Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp       | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
index 6b15f3552..94d3682be 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
@@ -157,6 +157,7 @@ public:
 
         void JustDied(Unit*  killer) override
         {
+			me->NearTeleportTo(nothPosition.GetPositionX(), nothPosition.GetPositionY(), nothPosition.GetPositionZ(), nothPosition.GetOrientation(), true);
             BossAI::JustDied(killer);
             Talk(SAY_DEATH);
         }
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
index 635ffd04e..54445d30a 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
@@ -587,6 +587,12 @@ public:
             ResetEvent();
             if(pInstance)
             {
+                if (Creature *brann = ObjectAccessor::GetCreature(*me, pInstance->GetData64(NPC_BRANN)))
+                {
+                    brann->setDeathState(JUST_DIED);
+                    brann->Respawn();
+                    brann->AI()->DoAction(5);
+                }
                 if (pInstance->GetData(BOSS_TRIBUNAL_OF_AGES) != DONE)
                     pInstance->SetData(BOSS_TRIBUNAL_OF_AGES, NOT_STARTED);
             }
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
index 004b0a2a3..8681ee3fa 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
@@ -682,7 +682,7 @@ public:
         {
             if (!pInstance)
                 return;
-
+            me->NearTeleportTo(me->GetPositionX(), me->GetPositionY(), 427.5, me->GetOrientation());
             if (IsEncounterComplete(pInstance, me))
             {
                 pInstance->SetData(TYPE_ASSEMBLY, DONE);