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

Fix replay timer assignment to new members

Browse Source 
Ignore expired state of replay timers when assigning to new members

This fixes a regression from a previous change that stopped assigning
expired lockouts to new members. Only expired event timers should be
ignored for new members. Replay Timers should always be added with a
a fresh lockout
This commit is contained in:
hg 2020-06-17 18:28:49 -04:00
parent 75410e8886
commit 892556e26d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/expedition.cpp
View File

@ -810,7 +810,7 @@ void Expedition::DzInviteResponse(Client* add_client, bool accepted, const std::
for (const auto& lockout_iter : m_lockouts) for (const auto& lockout_iter : m_lockouts)
{ {
const ExpeditionLockoutTimer& lockout = lockout_iter.second; const ExpeditionLockoutTimer& lockout = lockout_iter.second;
if (!lockout.IsInherited() && !lockout.IsExpired() && if (!lockout.IsInherited() &&
!add_client->HasExpeditionLockout(m_expedition_name, lockout.GetEventName())) !add_client->HasExpeditionLockout(m_expedition_name, lockout.GetEventName()))
{ {
// replay timers are optionally added to new members immediately on // replay timers are optionally added to new members immediately on
@ -823,7 +823,7 @@ void Expedition::DzInviteResponse(Client* add_client, bool accepted, const std::
lockout.GetExpeditionName(), lockout.GetEventName(), lockout.GetDuration()); lockout.GetExpeditionName(), lockout.GetEventName(), lockout.GetDuration());
} }
} }
else else if (!lockout.IsExpired())
{ {
pending_lockouts.emplace_back(lockout); pending_lockouts.emplace_back(lockout);
} }