diff options
| author | Shocker <shocker@freakz.ro> | 2011-10-07 09:28:10 -0700 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2011-10-07 09:28:10 -0700 |
| commit | 7f89678bcda1b58ff0701c0915074e81a9caf720 (patch) | |
| tree | 7af429895fce42337479a4b135257917875edfac /src/server/scripts/Northrend | |
| parent | b789cc63a7e2530ca1f511863db2d2a53af7c137 (diff) | |
| parent | 8acf07dbabca3ba5ea3c0de8b2b742f72c35c812 (diff) | |
Merge pull request #3278 from lost-illusion/master
CleanUp
Diffstat (limited to 'src/server/scripts/Northrend')
| -rw-r--r-- | src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
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; |