pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 17:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for glitchy mercenary unsuspend button behavior (report any abnormalities)

Browse Source
This commit is contained in:
Uleat 2017-03-18 16:11:07 -04:00
parent bafb199d24
commit d882c5fbf6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/client.cpp
View File

@ -625,7 +625,7 @@ bool Client::Save(uint8 iCommitNow) {
GetMercInfo().MercTimerRemaining = GetMercTimer()->GetRemainingTime(); GetMercInfo().MercTimerRemaining = GetMercTimer()->GetRemainingTime();
} }
if (!(GetMerc() && !dead)) { if (dead || (!GetMerc() && !GetMercInfo().IsSuspended)) {
memset(&m_mercinfo, 0, sizeof(struct MercInfo)); memset(&m_mercinfo, 0, sizeof(struct MercInfo));
} }