Cleanup unused arg in remove lockout method

This commit is contained in:
hg 2020-11-06 20:40:08 -05:00
parent 738fd48163
commit 54a175b3ef
2 changed files with 4 additions and 7 deletions

View File

@ -9675,7 +9675,7 @@ void Client::AddExpeditionLockoutDuration(
} }
void Client::RemoveExpeditionLockout( 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(), m_expedition_lockouts.erase(std::remove_if(m_expedition_lockouts.begin(), m_expedition_lockouts.end(),
[&](const ExpeditionLockoutTimer& lockout) { [&](const ExpeditionLockoutTimer& lockout) {
@ -9688,10 +9688,7 @@ void Client::RemoveExpeditionLockout(
ExpeditionDatabase::DeleteCharacterLockout(CharacterID(), expedition_name, event_name); ExpeditionDatabase::DeleteCharacterLockout(CharacterID(), expedition_name, event_name);
} }
if (update_client) SendExpeditionLockoutTimers();
{
SendExpeditionLockoutTimers();
}
} }
void Client::RemoveAllExpeditionLockouts(const std::string& expedition_name, bool update_db) void Client::RemoveAllExpeditionLockouts(const std::string& expedition_name, bool update_db)

View File

@ -1137,8 +1137,8 @@ public:
bool HasExpeditionLockout(const std::string& expedition_name, const std::string& event_name, bool include_expired = false); bool HasExpeditionLockout(const std::string& expedition_name, const std::string& event_name, bool include_expired = false);
bool IsInExpedition() const { return m_expedition_id != 0; } bool IsInExpedition() const { return m_expedition_id != 0; }
void RemoveAllExpeditionLockouts(const std::string& expedition_name, bool update_db = false); void RemoveAllExpeditionLockouts(const std::string& expedition_name, bool update_db = false);
void RemoveExpeditionLockout( void RemoveExpeditionLockout(const std::string& expedition_name,
const std::string& expedition_name, const std::string& event_name, bool update_db = false, bool update_client = true); const std::string& event_name, bool update_db = false);
void RequestPendingExpeditionInvite(); void RequestPendingExpeditionInvite();
void SendExpeditionLockoutTimers(); void SendExpeditionLockoutTimers();
void SetExpeditionID(uint32 expedition_id) { m_expedition_id = expedition_id; }; void SetExpeditionID(uint32 expedition_id) { m_expedition_id = expedition_id; };