mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-13 23:01:30 +00:00
Added a simple check to prevent DoEnduranceUpkeep (1 sec persistent timer)
from constantly checking when client has no endurance drain effects. This was running 24/7 for all classes.
This commit is contained in:
parent
22cc86e6a0
commit
59bcd031c8
@ -1928,10 +1928,14 @@ void Client::DoEnduranceRegen()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Client::DoEnduranceUpkeep() {
|
void Client::DoEnduranceUpkeep() {
|
||||||
|
|
||||||
|
if (!HasEndurUpkeep())
|
||||||
|
return;
|
||||||
|
|
||||||
int upkeep_sum = 0;
|
int upkeep_sum = 0;
|
||||||
|
int cost_redux = spellbonuses.EnduranceReduction + itembonuses.EnduranceReduction + aabonuses.EnduranceReduction;
|
||||||
|
|
||||||
int cost_redux = spellbonuses.EnduranceReduction + itembonuses.EnduranceReduction;
|
bool has_effect = false;
|
||||||
|
|
||||||
uint32 buffs_i;
|
uint32 buffs_i;
|
||||||
uint32 buff_count = GetMaxTotalSlots();
|
uint32 buff_count = GetMaxTotalSlots();
|
||||||
for (buffs_i = 0; buffs_i < buff_count; buffs_i++) {
|
for (buffs_i = 0; buffs_i < buff_count; buffs_i++) {
|
||||||
@ -1957,6 +1961,9 @@ void Client::DoEnduranceUpkeep() {
|
|||||||
SetEndurance(GetEndurance() - upkeep_sum);
|
SetEndurance(GetEndurance() - upkeep_sum);
|
||||||
TryTriggerOnValueAmount(false, false, true);
|
TryTriggerOnValueAmount(false, false, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!has_effect)
|
||||||
|
SetEndurUpkeep(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Client::CalcRestState() {
|
void Client::CalcRestState() {
|
||||||
|
|||||||
@ -1160,10 +1160,14 @@ void Merc::SetEndurance(int32 newEnd)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Merc::DoEnduranceUpkeep() {
|
void Merc::DoEnduranceUpkeep() {
|
||||||
int upkeep_sum = 0;
|
|
||||||
|
|
||||||
|
if (!HasEndurUpkeep())
|
||||||
|
return;
|
||||||
|
|
||||||
|
int upkeep_sum = 0;
|
||||||
int cost_redux = spellbonuses.EnduranceReduction + itembonuses.EnduranceReduction;
|
int cost_redux = spellbonuses.EnduranceReduction + itembonuses.EnduranceReduction;
|
||||||
|
|
||||||
|
bool has_effect = false;
|
||||||
uint32 buffs_i;
|
uint32 buffs_i;
|
||||||
uint32 buff_count = GetMaxTotalSlots();
|
uint32 buff_count = GetMaxTotalSlots();
|
||||||
for (buffs_i = 0; buffs_i < buff_count; buffs_i++) {
|
for (buffs_i = 0; buffs_i < buff_count; buffs_i++) {
|
||||||
@ -1187,6 +1191,9 @@ void Merc::DoEnduranceUpkeep() {
|
|||||||
|
|
||||||
if(upkeep_sum != 0)
|
if(upkeep_sum != 0)
|
||||||
SetEndurance(GetEndurance() - upkeep_sum);
|
SetEndurance(GetEndurance() - upkeep_sum);
|
||||||
|
|
||||||
|
if (!has_effect)
|
||||||
|
SetEndurUpkeep(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Merc::CalcRestState() {
|
void Merc::CalcRestState() {
|
||||||
|
|||||||
@ -391,6 +391,7 @@ Mob::Mob(const char* in_name,
|
|||||||
for (int i = 0; i < HIGHEST_RESIST+2; i++) { Vulnerability_Mod[i] = 0; }
|
for (int i = 0; i < HIGHEST_RESIST+2; i++) { Vulnerability_Mod[i] = 0; }
|
||||||
|
|
||||||
emoteid = 0;
|
emoteid = 0;
|
||||||
|
endur_upkeep = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Mob::~Mob()
|
Mob::~Mob()
|
||||||
|
|||||||
@ -290,6 +290,8 @@ public:
|
|||||||
inline float GetTargetRingX() const { return targetring_x; }
|
inline float GetTargetRingX() const { return targetring_x; }
|
||||||
inline float GetTargetRingY() const { return targetring_y; }
|
inline float GetTargetRingY() const { return targetring_y; }
|
||||||
inline float GetTargetRingZ() const { return targetring_z; }
|
inline float GetTargetRingZ() const { return targetring_z; }
|
||||||
|
inline bool HasEndurUpkeep() const { return endur_upkeep; }
|
||||||
|
inline void SetEndurUpkeep(bool val) { endur_upkeep = val; }
|
||||||
|
|
||||||
//Basic Stats/Inventory
|
//Basic Stats/Inventory
|
||||||
virtual void SetLevel(uint8 in_level, bool command = false) { level = in_level; }
|
virtual void SetLevel(uint8 in_level, bool command = false) { level = in_level; }
|
||||||
@ -1130,6 +1132,7 @@ protected:
|
|||||||
int16 SpellPowerDistanceMod;
|
int16 SpellPowerDistanceMod;
|
||||||
bool last_los_check;
|
bool last_los_check;
|
||||||
bool pseudo_rooted;
|
bool pseudo_rooted;
|
||||||
|
bool endur_upkeep;
|
||||||
|
|
||||||
// Bind wound
|
// Bind wound
|
||||||
Timer bindwound_timer;
|
Timer bindwound_timer;
|
||||||
|
|||||||
@ -130,6 +130,9 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
|
|||||||
buffs[buffslot].magic_rune = 0;
|
buffs[buffslot].magic_rune = 0;
|
||||||
buffs[buffslot].numhits = 0;
|
buffs[buffslot].numhits = 0;
|
||||||
|
|
||||||
|
if (spells[spell_id].EndurUpkeep > 0)
|
||||||
|
SetEndurUpkeep(true);
|
||||||
|
|
||||||
if(IsClient() && CastToClient()->GetClientVersionBit() & BIT_UnderfootAndLater)
|
if(IsClient() && CastToClient()->GetClientVersionBit() & BIT_UnderfootAndLater)
|
||||||
{
|
{
|
||||||
EQApplicationPacket *outapp = MakeBuffsPacket(false);
|
EQApplicationPacket *outapp = MakeBuffsPacket(false);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user