pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 10:50:24 +00:00
Code Issues Actions 1 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_process.cpp
+1 -1
View File
@@ -249,7 +249,7 @@ bool Client::Process() {
UpdateMercTimer();
}
if(GetMercInfo().MercTemplateID != 0)
if(GetMercInfo().MercTemplateID != 0 && GetMercInfo().IsSuspended)
{
if(p_timers.Expired(&database, pTimerMercSuspend, false)) {
CheckMercSuspendTimer();