pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 13:16:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove member history from expeditions

Browse Source 
Expedition uuids are now used to check if characters may re-join
This commit is contained in:
hg
2020-06-13 20:19:03 -04:00
parent deedc392bf
commit 32c69d235d
8 changed files with 40 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/expedition.h
+2 -4
View File
@@ -27,7 +27,6 @@
#include <memory>
#include <string>
#include <unordered_map>
#include <unordered_set>
#include <vector>
class Client;
@@ -138,7 +137,7 @@ private:
static void CacheExpeditions(MySQLRequestResult& results);
static void SendWorldGetOnlineMembers(const std::vector<std::pair<uint32_t, uint32_t>>& expedition_character_ids);
void AddInternalMember(const std::string& char_name, uint32_t char_id, ExpeditionMemberStatus status, bool is_current_member = true);
void AddInternalMember(const std::string& char_name, uint32_t char_id, ExpeditionMemberStatus status);
bool ChooseNewLeader();
bool ConfirmLeaderCommand(Client* requester);
bool ProcessAddConflicts(Client* leader_client, Client* add_client, bool swapping);
@@ -183,8 +182,7 @@ private:
std::string m_expedition_name;
DynamicZone m_dynamiczone { DynamicZoneType::Expedition };
ExpeditionMember m_leader;
std::vector<ExpeditionMember> m_members; // current members
std::unordered_set<uint32_t> m_member_id_history; // track past members to allow invites for replay timer bypass
std::vector<ExpeditionMember> m_members;
std::unordered_map<std::string, ExpeditionLockoutTimer> m_lockouts;
};