From 54a175b3efdc28473f97e483880d212711e67f71 Mon Sep 17 00:00:00 2001 From: hg <4683435+hgtw@users.noreply.github.com> Date: Fri, 6 Nov 2020 20:40:08 -0500 Subject: [PATCH] Cleanup unused arg in remove lockout method --- zone/client.cpp | 7 ++----- zone/client.h | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/zone/client.cpp b/zone/client.cpp index 361a10ccc..1fb124799 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -9675,7 +9675,7 @@ void Client::AddExpeditionLockoutDuration( } void Client::RemoveExpeditionLockout( - const std::string& expedition_name, const std::string& event_name, bool update_db, bool update_client) + const std::string& expedition_name, const std::string& event_name, bool update_db) { m_expedition_lockouts.erase(std::remove_if(m_expedition_lockouts.begin(), m_expedition_lockouts.end(), [&](const ExpeditionLockoutTimer& lockout) { @@ -9688,10 +9688,7 @@ void Client::RemoveExpeditionLockout( ExpeditionDatabase::DeleteCharacterLockout(CharacterID(), expedition_name, event_name); } - if (update_client) - { - SendExpeditionLockoutTimers(); - } + SendExpeditionLockoutTimers(); } void Client::RemoveAllExpeditionLockouts(const std::string& expedition_name, bool update_db) diff --git a/zone/client.h b/zone/client.h index 572170013..8d786eb6e 100644 --- a/zone/client.h +++ b/zone/client.h @@ -1137,8 +1137,8 @@ public: bool HasExpeditionLockout(const std::string& expedition_name, const std::string& event_name, bool include_expired = false); bool IsInExpedition() const { return m_expedition_id != 0; } void RemoveAllExpeditionLockouts(const std::string& expedition_name, bool update_db = false); - void RemoveExpeditionLockout( - const std::string& expedition_name, const std::string& event_name, bool update_db = false, bool update_client = true); + void RemoveExpeditionLockout(const std::string& expedition_name, + const std::string& event_name, bool update_db = false); void RequestPendingExpeditionInvite(); void SendExpeditionLockoutTimers(); void SetExpeditionID(uint32 expedition_id) { m_expedition_id = expedition_id; };