pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-19 13:28:25 +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_packet.cpp
+1 -1
View File
@@ -13814,7 +13814,7 @@ void Client::Handle_OP_MercenaryTimerRequest(const EQApplicationPacket *app)
}
if(entityID > 0) {
SendMercTimerPacket(entityID, mercState, suspendedTime, RuleI(Mercs, UpkeepIntervalMS), RuleI(Mercs, SuspendIntervalMS));
SendMercTimerPacket(entityID, mercState, suspendedTime, GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS));
}
}