pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-15 16:41:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move LoadAllClientLockouts back to a client method

Browse Source
This commit is contained in:
hg 2020-05-13 18:49:45 -04:00
parent 158dad052c
commit af766dd323
4 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zone/client.cpp
View File

@ -9581,7 +9581,7 @@ void Client::UpdateExpeditionInfoAndLockouts()
} }
} }
Expedition::LoadAllClientLockouts(this); LoadAllExpeditionLockouts();
} }
Expedition* Client::CreateExpedition( Expedition* Client::CreateExpedition(
@ -9704,6 +9704,22 @@ bool Client::HasExpeditionLockout(
return (GetExpeditionLockout(expedition_name, event_name, include_expired) != nullptr); return (GetExpeditionLockout(expedition_name, event_name, include_expired) != nullptr);
} }
void Client::LoadAllExpeditionLockouts()
{
auto results = ExpeditionDatabase::LoadCharacterLockouts(CharacterID());
if (results.Success())
{
for (auto row = results.begin(); row != results.end(); ++row)
{
auto expire_time = strtoull(row[0], nullptr, 10);
auto original_duration = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
ExpeditionLockoutTimer lockout{ row[2], row[3], expire_time, original_duration };
AddExpeditionLockout(lockout);
}
}
SendExpeditionLockoutTimers();
}
void Client::SendExpeditionLockoutTimers() void Client::SendExpeditionLockoutTimers()
{ {
std::vector<ExpeditionLockoutTimerEntry_Struct> lockout_entries; std::vector<ExpeditionLockoutTimerEntry_Struct> lockout_entries;

1
zone/client.h
View File

@ -1134,6 +1134,7 @@ public:
void SetPendingExpeditionInvite(uint32 id) { m_pending_expedition_invite_id = id; } void SetPendingExpeditionInvite(uint32 id) { m_pending_expedition_invite_id = id; }
void SendExpeditionLockoutTimers(); void SendExpeditionLockoutTimers();
void SetExpeditionID(uint32 expedition_id) { m_expedition_id = expedition_id; }; void SetExpeditionID(uint32 expedition_id) { m_expedition_id = expedition_id; };
void LoadAllExpeditionLockouts();
void UpdateExpeditionInfoAndLockouts(); void UpdateExpeditionInfoAndLockouts();
void DzListTimers(); void DzListTimers();
void SetDzRemovalTimer(bool enable_timer); void SetDzRemovalTimer(bool enable_timer);

21
zone/expedition.cpp
View File

@ -254,27 +254,6 @@ bool Expedition::CacheAllFromDatabase()
return true; return true;
} }
void Expedition::LoadAllClientLockouts(Client* client)
{
if (!client)
{
return;
}
auto results = ExpeditionDatabase::LoadCharacterLockouts(client->CharacterID());
if (results.Success())
{
for (auto row = results.begin(); row != results.end(); ++row)
{
auto expire_time = strtoull(row[0], nullptr, 10);
auto original_duration = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
ExpeditionLockoutTimer lockout{ row[2], row[3], expire_time, original_duration };
client->AddExpeditionLockout(lockout);
}
}
client->SendExpeditionLockoutTimers();
}
void Expedition::LoadMembers() void Expedition::LoadMembers()
{ {
m_members.clear(); m_members.clear();

1
zone/expedition.h
View File

@ -73,7 +73,6 @@ public:
static void CacheFromDatabase(uint32_t expedition_id); static void CacheFromDatabase(uint32_t expedition_id);
static bool CacheAllFromDatabase(); static bool CacheAllFromDatabase();
static void CacheExpeditions(MySQLRequestResult& results); static void CacheExpeditions(MySQLRequestResult& results);
static void LoadAllClientLockouts(Client* client);
static Expedition* FindCachedExpeditionByCharacterID(uint32_t character_id); static Expedition* FindCachedExpeditionByCharacterID(uint32_t character_id);
static Expedition* FindCachedExpeditionByCharacterName(const std::string& char_name); static Expedition* FindCachedExpeditionByCharacterName(const std::string& char_name);
static Expedition* FindCachedExpeditionByID(uint32_t expedition_id); static Expedition* FindCachedExpeditionByID(uint32_t expedition_id);