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

Only delete empty expeditions when the dz is empty

Browse Source 
Zones are no longer able to delete expeditions. World now tracks empty
expeditions in cache and only deletes them when it detects an
expedition's dynamic zone instance has no more clients inside.

This fixes an exploit where lockouts couldn't be applied to expeditions
after all members were removed because zones were deleting the expedition
immediately. Clients still inside the dz were able to complete events
before being kicked from the instance while not having an expedition.

Expeditions are no longer purged from database in the world purge
instance timer to avoid a possible race with this new system
This commit is contained in:
hg
2020-05-26 22:32:08 -04:00
parent dcbcc5a156
commit 148af3edfc
10 changed files with 167 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/expedition.h
+11 -1
View File
@@ -24,6 +24,7 @@
#include "../common/rulesys.h"
#include "../common/timer.h"
#include <chrono>
#include <unordered_set>
#include <vector>
extern class ExpeditionCache expedition_cache;
@@ -56,6 +57,8 @@ public:
void AddExpedition(uint32_t expedition_id);
void RemoveExpedition(uint32_t expedition_id);
void LoadActiveExpeditions();
void MemberChange(uint32_t expedition_id, uint32_t character_id, bool remove);
void RemoveAllMembers(uint32_t expedition_id);
void Process();
private:
@@ -71,9 +74,15 @@ public:
uint32_t expedition_id, uint32_t instance_id, uint32_t dz_zone_id,
uint32_t expire_time, uint32_t duration);
void AddMember(uint32_t character_id) { m_member_ids.emplace(character_id); }
void RemoveMember(uint32_t character_id) { m_member_ids.erase(character_id); }
void RemoveAllMembers() { m_member_ids.clear(); }
uint32_t GetID() const { return m_expedition_id; }
uint16_t GetInstanceID() const { return static_cast<uint16_t>(m_dz_instance_id); }
uint16_t GetZoneID() const { return static_cast<uint16_t>(m_dz_zone_id); }
bool IsEmpty() const { return m_member_ids.empty(); }
bool IsExpired() const { return m_expire_time < std::chrono::system_clock::now(); }
void SendZonesExpeditionExpired();
void SendZonesExpeditionDeleted();
private:
uint32_t m_expedition_id = 0;
@@ -81,6 +90,7 @@ private:
uint32_t m_dz_zone_id = 0;
uint32_t m_start_time = 0;
uint32_t m_duration = 0;
std::unordered_set<uint32_t> m_member_ids;
std::chrono::time_point<std::chrono::system_clock> m_expire_time;
};