From 6fbeda297b47c5acc6e0d8b1b4c8b5dcdc621ebc Mon Sep 17 00:00:00 2001
From: ArashGorge <52334511+ArashGorge@users.noreply.github.com>
Date: Tue, 13 Aug 2019 12:44:25 +0430
Subject: [PATCH] fix(Core/Boss Script): Obsidian Sanctum Bugs Fixed (Cant
 enter instance while boss in combat , fix HardMode problem with damage drakes
 before starting boss) (#2130)

---
 .../ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp  | 1 +
 .../ObsidianSanctum/instance_obsidian_sanctum.cpp         | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
index a33d91910..52d4e355d 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
@@ -274,6 +274,7 @@ public:
                         dragonsCount++;
                         me->AddLootMode(1 << dragonsCount);
 
+                        cr->SetHealth(cr->GetMaxHealth());
                         switch(DATA_TENEBRON+i)
                         {
                             case DATA_TENEBRON:
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
index 6ec5caf4e..ba12bfc02 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
@@ -40,6 +40,14 @@ public:
             memset(&Encounters, 0, sizeof(Encounters));
         };
 
+        bool IsEncounterInProgress() const
+        {
+            if (Encounters[BOSS_SARTHARION_EVENT] == IN_PROGRESS)
+                return true;
+
+            return false;
+        }
+
         void OnCreatureCreate(Creature* pCreature)
         {
             switch(pCreature->GetEntry())