Core/Creature: regenerate health

There are three possible scenarios regarding regenerating health
- db lock and curhealth set to > 0
- db lock and curhealth set to 0
- dynamic lock (set in scripts and such) overriding db lock

(cherry picked from commit 91c0d49c188977c3d797f5749b1204612ce50195)

4 files changed, 7 insertions, 7 deletions

diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
index dbd4cb47909..a071eb87f2b 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
@@ -551,7 +551,7 @@ struct gunship_npc_AI : public ScriptedAI
         Instance(creature->GetInstanceScript()), Slot(nullptr), Index(uint32(-1))
     {
         BurningPitchId = Instance->GetData(DATA_TEAM_IN_INSTANCE) == HORDE ? SPELL_BURNING_PITCH_A : SPELL_BURNING_PITCH_H;
-        me->setRegeneratingHealth(false);
+        me->SetRegenerateHealth(false);
     }
 
     void SetData(uint32 type, uint32 data) override
@@ -677,7 +677,7 @@ class npc_gunship : public CreatureScript
                 _teamInInstance(creature->GetInstanceScript()->GetData(DATA_TEAM_IN_INSTANCE)),
                 _summonedFirstMage(false), _died(false)
             {
-                me->setRegeneratingHealth(false);
+                me->SetRegenerateHealth(false);
             }
 
             void DamageTaken(Unit* /*source*/, uint32& damage) override
@@ -852,7 +852,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
             {
                 _controller.ResetSlots(HORDE);
                 _controller.SetTransport(creature->GetTransport());
-                me->setRegeneratingHealth(false);
+                me->SetRegenerateHealth(false);
                 me->m_CombatDistance = 70.0f;
                 _firstMageCooldown = time(nullptr) + 60;
                 _axethrowersYellCooldown = time_t(0);
@@ -1121,7 +1121,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
             {
                 _controller.ResetSlots(ALLIANCE);
                 _controller.SetTransport(creature->GetTransport());
-                me->setRegeneratingHealth(false);
+                me->SetRegenerateHealth(false);
                 me->m_CombatDistance = 70.0f;
                 _firstMageCooldown = time(nullptr) + 60;
                 _riflemanYellCooldown = time_t(0);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
index 3853594ca05..ec543fc1768 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
@@ -872,7 +872,7 @@ struct npc_expedition_defender : public ScriptedAI
 {
     npc_expedition_defender(Creature* creature) : ScriptedAI(creature), _myPositionNumber(0), _instance(creature->GetInstanceScript())
     {
-        me->setRegeneratingHealth(false);
+        me->SetRegenerateHealth(false);
     }
 
     void Reset() override
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 6de234a6593..4e35b0b4fc5 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -344,7 +344,7 @@ public:
         void Reset() override
         {
             me->SetReactState(REACT_PASSIVE);
-            me->setRegeneratingHealth(false);
+            me->SetRegenerateHealth(false);
             me->SetSpeedRate(MOVE_RUN, 2.5f);
         }
 
diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp
index bf4caf3128f..55884eab019 100644
--- a/src/server/scripts/Northrend/zone_icecrown.cpp
+++ b/src/server/scripts/Northrend/zone_icecrown.cpp
@@ -432,7 +432,7 @@ public:
 
         void Reset() override
         {
-            me->setRegeneratingHealth(false);
+            me->SetRegenerateHealth(false);
             DoCast(SPELL_THREAT_PULSE);
             Talk(BANNER_SAY);
             events.ScheduleEvent(EVENT_SPAWN, 3000);