pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-24 21:58:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove dz check in expedition invite reply

Browse Source 
Characters can no longer be re-invited while inside a dz, these checks
aren't necessary
This commit is contained in:
hg
2020-07-02 00:15:53 -04:00
parent 940c8fcb36
commit 09d7731ccf
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/expedition.cpp
+1 -8
View File
@@ -842,10 +842,8 @@ void Expedition::DzInviteResponse(Client* add_client, bool accepted, const std::
} }
} }
bool add_immediately = m_dynamiczone.IsCurrentZoneDzInstance();
ExpeditionDatabase::InsertCharacterLockouts( ExpeditionDatabase::InsertCharacterLockouts(
add_client->CharacterID(), pending_lockouts, false, !add_immediately); add_client->CharacterID(), pending_lockouts, false, true);
if (was_swap_invite) if (was_swap_invite)
{ {
@@ -855,11 +853,6 @@ void Expedition::DzInviteResponse(Client* add_client, bool accepted, const std::
{ {
AddMember(add_client->GetName(), add_client->CharacterID()); AddMember(add_client->GetName(), add_client->CharacterID());
} }
if (m_dynamiczone.IsCurrentZoneDzInstance())
{
SetMemberStatus(add_client, ExpeditionMemberStatus::InDynamicZone);
}
} }
} }
zone/expedition_database.cpp
+1 -1
View File
@@ -455,7 +455,7 @@ void ExpeditionDatabase::InsertCharacterLockouts(
uint32_t character_id, const std::vector<ExpeditionLockoutTimer>& lockouts, uint32_t character_id, const std::vector<ExpeditionLockoutTimer>& lockouts,
bool replace_timer, bool is_pending) bool replace_timer, bool is_pending)
{ {
LogExpeditionsDetail("Inserting character [{}] lockouts", character_id); LogExpeditionsDetail("Inserting [{}] lockouts for character [{}]", lockouts.size(), character_id);
std::string insert_values; std::string insert_values;
for (const auto& lockout : lockouts) for (const auto& lockout : lockouts)