aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorccrs <ccrs@users.noreply.github.com>2017-08-21 20:28:18 +0200
committerShauren <shauren.trinity@gmail.com>2020-08-23 15:56:21 +0200
commit9a5e2b80b39d3c0a466aec1ab3a6dbccf938f570 (patch)
tree91c99943a46367f1610618edae353f75cc2b5945 /src/server/scripts
parent04c974dbc3eb31aeba309f05e21b281fa6a14e6f (diff)
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)
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp8
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp2
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp2
-rw-r--r--src/server/scripts/Northrend/zone_icecrown.cpp2
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp2
7 files changed, 10 insertions, 10 deletions
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index db30bde2134..837863205d2 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -310,7 +310,7 @@ struct boss_kalecgos : public BossAI
case EVENT_OUTRO_START:
events.Reset();
events.SetPhase(PHASE_OUTRO);
- me->setRegeneratingHealth(false);
+ me->SetRegenerateHealth(false);
me->SetReactState(REACT_PASSIVE);
me->InterruptNonMeleeSpells(true);
me->RemoveAllAttackers();
diff --git a/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp b/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp
index d25cb2f9fed..ed287bbe846 100644
--- a/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp
@@ -445,7 +445,7 @@ public:
{
if (Creature* target = GetHitCreature())
{
- target->setRegeneratingHealth(false);
+ target->SetRegenerateHealth(false);
target->SetHealth(target->CountPctFromMaxHealth(10));
}
}
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);
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
index aa5a5a9a170..b668c1a7989 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
@@ -309,7 +309,7 @@ public:
void Initialize()
{
me->SetReactState(REACT_PASSIVE);
- me->setRegeneratingHealth(false);
+ me->SetRegenerateHealth(false);
DoCast(me, SPELL_FROZEN_CORE_GETS_HIT);
DoCast(me, SPELL_ICE_SPEAR_AURA);
}