pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-19 17:38:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Beneficial spells will now correctly inherit targets RestTimer

Browse Source 
Example PC A is fighting mob B. PC C casts a heal on PC A. PC C will
inherit the timer from PC A. This is done because beneficial spells have
a "witness" check from NPCs so there is a chance PC C would not gain
aggro and could just keep on going with no RestTimer which allows them
to fast regen while actively participating.
This commit is contained in:
Michael Cook (mackal)
2018-07-14 18:50:02 -04:00
parent 18005ac7a9
commit 6ab2871fd1
3 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+31
View File
@@ -4608,6 +4608,7 @@ void Client::IncrementAggroCount(bool raid_target)
uint32 newtimer = raid_target ? RuleI(Character, RestRegenRaidTimeToActivate) : RuleI(Character, RestRegenTimeToActivate);
// save the new timer if it's higher
m_pp.RestTimer = std::max(m_pp.RestTimer, newtimer);
// If we already had aggro before this method was called, the combat indicator should already be up for SoF clients,
@@ -4661,6 +4662,36 @@ void Client::DecrementAggroCount()
}
}
// when we cast a beneficial spell we need to steal our targets current timer
// That's what we use this for
void Client::UpdateRestTimer(uint32 new_timer)
{
// their timer was 0, so we don't do anything
if (new_timer == 0)
return;
if (!RuleB(Character, RestRegenEnabled))
return;
// so if we're currently on aggro, we check our saved timer
if (AggroCount) {
if (m_pp.RestTimer < new_timer) // our timer needs to be updated, don't need to update client here
m_pp.RestTimer = new_timer;
} else { // if we're not aggro, we need to check if current timer needs updating
if (rest_timer.GetRemainingTime() < new_timer) {
rest_timer.Start(new_timer);
if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF) {
auto outapp = new EQApplicationPacket(OP_RestState, 5);
char *Buffer = (char *)outapp->pBuffer;
VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0x00);
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, new_timer);
QueuePacket(outapp);
safe_delete(outapp);
}
}
}
}
void Client::SendPVPStats()
{
// This sends the data to the client to populate the PVP Stats Window.