Ignore expired lockouts on expedition invite

This fixes an edge case with client invites sometimes failing because
an expired lockout hasn't been removed from client yet

Clients no longer receive expired lockouts from expeditions when joining
This commit is contained in:
hg
2020-06-01 18:21:12 -04:00
parent 95a076c5ad
commit 8ae063f953
5 changed files with 33 additions and 26 deletions
+1 -1
View File
@@ -25,7 +25,6 @@
extern const char* const DZ_REPLAY_TIMER_NAME;
// DynamicZoneEventTimer and DynamicZoneReplayTimer in client
class ExpeditionLockoutTimer
{
public:
@@ -47,6 +46,7 @@ public:
const std::string& GetEventName() const { return m_event_name; }
void SetExpireTime(uint64_t expire_time) { m_expire_time = expire_time; }
void SetInherited(bool is_inherited) { m_is_inherited = is_inherited; }
bool IsExpired() const { return GetSecondsRemaining() == 0; }
bool IsInherited() const { return m_is_inherited; }
bool IsReplayTimer() const { return m_is_replay_timer; }
bool IsSameLockout(const ExpeditionLockoutTimer& compare_lockout) const;