From ce73f6bfe12d40b03045f2f9e79c3c49b016b1c8 Mon Sep 17 00:00:00 2001 From: Fryguy Date: Mon, 8 Jan 2024 03:45:19 -0500 Subject: [PATCH] [Bug Fix] Fix for HasLockoutByCharacterID (#3927) Per HG, this will resolve issues with HasLockoutByCharacterID --- zone/expedition.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zone/expedition.cpp b/zone/expedition.cpp index 1537b2f06..3e2b7c2e8 100644 --- a/zone/expedition.cpp +++ b/zone/expedition.cpp @@ -1171,7 +1171,7 @@ bool Expedition::HasLockoutByCharacterID( { auto lockouts = Expedition::GetExpeditionLockoutsByCharacterID(character_id); return std::any_of(lockouts.begin(), lockouts.end(), [&](const ExpeditionLockoutTimer& lockout) { - return lockout.IsSameLockout(expedition_name, event_name); + return !lockout.IsExpired() && lockout.IsSameLockout(expedition_name, event_name); }); }