From 61655501339bd4fa12b4e83e1c3a9a73a9deb5b5 Mon Sep 17 00:00:00 2001 From: hg <4683435+hgtw@users.noreply.github.com> Date: Wed, 10 Jun 2020 22:57:44 -0400 Subject: [PATCH] Copy instead of moving expedition request data --- zone/expedition.cpp | 12 +++++------- zone/expedition_request.h | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/zone/expedition.cpp b/zone/expedition.cpp index ef7ea5b73..e6d46e34d 100644 --- a/zone/expedition.cpp +++ b/zone/expedition.cpp @@ -299,13 +299,13 @@ bool Expedition::CacheAllFromDatabase() void Expedition::SaveLockouts(ExpeditionRequest& request) { - m_lockouts = std::move(request).TakeLockouts(); + m_lockouts = request.GetLockouts(); ExpeditionDatabase::InsertLockouts(m_id, m_lockouts); } void Expedition::SaveMembers(ExpeditionRequest& request) { - m_members = std::move(request).TakeMembers(); + m_members = request.GetMembers(); for (const auto& member : m_members) { m_member_id_history.emplace(member.char_id); @@ -1047,8 +1047,7 @@ void Expedition::DzSwapPlayer( if (remove_char_name.empty() || !HasMember(remove_char_name)) { - remove_char_name = FormatName(remove_char_name); - requester->MessageString(Chat::Red, DZSWAP_CANNOT_REMOVE, remove_char_name.c_str()); + requester->MessageString(Chat::Red, DZSWAP_CANNOT_REMOVE, FormatName(remove_char_name).c_str()); return; } @@ -1180,7 +1179,6 @@ void Expedition::ProcessMemberRemoved(std::string removed_char_name, uint32_t re return; } - // cache a re-usable packet for each member auto outapp_member_name = CreateMemberListNamePacket(removed_char_name, true); for (auto it = m_members.begin(); it != m_members.end();) @@ -1212,8 +1210,8 @@ void Expedition::ProcessMemberRemoved(std::string removed_char_name, uint32_t re } LogExpeditionsDetail( - "Processed member [{}] ({}) removal, current zone cache member count: [{}]", - removed_char_name, removed_char_id, m_members.size() + "Processed member [{}] ({}) removal from [{}], cache member count: [{}]", + removed_char_name, removed_char_id, m_id, m_members.size() ); } diff --git a/zone/expedition_request.h b/zone/expedition_request.h index f128cc4c4..fdd71e5e2 100644 --- a/zone/expedition_request.h +++ b/zone/expedition_request.h @@ -50,8 +50,8 @@ public: uint32_t GetMinPlayers() const { return m_min_players; } uint32_t GetMaxPlayers() const { return m_max_players; } bool HasReplayTimer() const { return m_has_replay_timer; } - std::vector TakeMembers() && { return std::move(m_members); } - std::unordered_map TakeLockouts() && { return std::move(m_lockouts); } + std::vector GetMembers() const { return m_members; } + std::unordered_map GetLockouts() const { return m_lockouts; } private: bool ValidateMembers(const std::vector& member_names);