pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-23 19:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HP update adjustment that should cover a scenario when mob is feared

Browse Source
This commit is contained in:
Akkadius 2018-08-11 00:12:09 -05:00
parent ddd3e43d4e
commit 1e0ec048af
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/merc.cpp
View File

@ -1303,7 +1303,7 @@ bool Merc::Process()
_check_confidence = true; _check_confidence = true;
} }
if (sendhpupdate_timer.Check()) { if (send_hp_update_timer.Check()) {
SendHPUpdate(); SendHPUpdate();
} }

12
zone/npc.cpp
View File

@ -116,7 +116,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, const glm::vec4& position, int if
knightattack_timer(1000), knightattack_timer(1000),
assist_timer(AIassistcheck_delay), assist_timer(AIassistcheck_delay),
qglobal_purge_timer(30000), qglobal_purge_timer(30000),
sendhpupdate_timer(2000), send_hp_update_timer(2000),
enraged_timer(1000), enraged_timer(1000),
taunt_timer(TauntReuseTime * 1000), taunt_timer(TauntReuseTime * 1000),
m_SpawnPoint(position), m_SpawnPoint(position),
@ -745,11 +745,11 @@ bool NPC::Process()
} }
} }
// we might actually want to reset in this check ... won't until issues arise at least :P /**
if (sendhpupdate_timer.Check(false) && (IsTargeted() || (IsPet() && GetOwner() && GetOwner()->IsClient()))) { * Send HP updates when engaged
if(!IsFullHP || cur_hp<max_hp){ */
SendHPUpdate(); if (send_hp_update_timer.Check(false) && this->IsEngaged()) {
} SendHPUpdate();
} }
if(HasVirus()) { if(HasVirus()) {

4
zone/npc.h
View File

@ -423,7 +423,7 @@ public:
void SetHeroForgeModel(uint32 model) { herosforgemodel = model; } void SetHeroForgeModel(uint32 model) { herosforgemodel = model; }
bool IsRaidTarget() const { return raid_target; }; bool IsRaidTarget() const { return raid_target; };
void ResetHPUpdateTimer() { sendhpupdate_timer.Start(); } void ResetHPUpdateTimer() { send_hp_update_timer.Start(); }
bool IgnoreDespawn() { return ignore_despawn; } bool IgnoreDespawn() { return ignore_despawn; }
@ -456,7 +456,7 @@ protected:
Timer qglobal_purge_timer; Timer qglobal_purge_timer;
bool combat_event; //true if we are in combat, false otherwise bool combat_event; //true if we are in combat, false otherwise
Timer sendhpupdate_timer; Timer send_hp_update_timer;
Timer enraged_timer; Timer enraged_timer;
Timer *reface_timer; Timer *reface_timer;