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

-Merc upkeep timers fixed to display properly. They now persist through zones as well as save to the database properly.

Browse Source 
-Merc unsuspend timers should now be more reliable across zone shutdown.
This commit is contained in:
SecretsOTheP
2013-03-23 04:58:03 -04:00
parent ac040b5197
commit abaad22eb4
6 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+3 -2
View File
@@ -232,6 +232,7 @@ Client::Client(EQStreamInterface* ieqs)
dead_timer.Disable();
camp_timer.Disable();
autosave_timer.Disable();
GetMercTimer()->Disable();
instalog = false;
pLastUpdate = 0;
pLastUpdateWZ = 0;
@@ -562,8 +563,8 @@ bool Client::Save(uint8 iCommitNow) {
if(GetMercInfo().MercTimerRemaining > RuleI(Mercs, UpkeepIntervalMS))
GetMercInfo().MercTimerRemaining = RuleI(Mercs, UpkeepIntervalMS);
if(merc_timer.Enabled()) {
GetMercInfo().MercTimerRemaining = merc_timer.GetRemainingTime();
if(GetMercTimer()->Enabled()) {
GetMercInfo().MercTimerRemaining = GetMercTimer()->GetRemainingTime();
}
if (GetMerc() && !dead) {