From 8acf07dbabca3ba5ea3c0de8b2b742f72c35c812 Mon Sep 17 00:00:00 2001
From: unknown <illusion@.(none)>
Date: Thu, 29 Sep 2011 22:35:00 +0400
Subject: Random minor code cleanup

---
 .../ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp       | 4 ++--
 src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp        | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/server/scripts/Northrend')

diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
index 7e8b8565fc9..f602f41ce11 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
@@ -160,7 +160,7 @@ class boss_baltharus_the_warborn : public CreatureScript
                         DoAction(ACTION_CLONE);
                 }
 
-                if (me->GetHealth() - damage > 0)
+                if (me->GetHealth() > damage)
                     instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetHealth() - damage);
             }
 
@@ -246,7 +246,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript
             void DamageTaken(Unit* /*attacker*/, uint32& damage)
             {
                 // Setting DATA_BALTHARUS_SHARED_HEALTH to 0 when killed would bug the boss.
-                if (_instance && me->GetHealth() - damage > 0)
+                if (_instance && me->GetHealth() > damage)
                     _instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetHealth() - damage);
             }
 
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
index 9e577ec4319..50c6caffa04 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
@@ -104,7 +104,6 @@ class instance_ulduar : public InstanceMapScript
                 AlgalonGUID                      = 0;
                 KologarnChestGUID                = 0;
                 KologarnBridgeGUID               = 0;
-                KologarnChestGUID                = 0;
                 ThorimChestGUID                  = 0;
                 HodirRareCacheGUID               = 0;
                 HodirChestGUID                   = 0;
-- 
cgit v1.2.3