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

Require zone id to get expedition by instance id

Browse Source 
This is a breaking api change
eq.get_expedition_by_instance_id(instance_id) is replaced with
eq.get_expedition_by_zone_instance(zone_id, instance_id)

This replaces the FindCachedExpeditionByInstanceID method of
obtaining expeditions via instance id with a new method that
requires the dz zone id as well
This commit is contained in:
hg
2020-10-04 19:20:54 -04:00
parent cd98b8bc6f
commit 79287fc507
6 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/zone.cpp
+2 -2
View File
@@ -1492,7 +1492,7 @@ bool Zone::Process() {
if(Instance_Timer->Check())
{
// if this is a dynamic zone instance notify system associated with it
Expedition* expedition = Expedition::FindCachedExpeditionByInstanceID(GetInstanceID());
auto expedition = Expedition::FindCachedExpeditionByZoneInstance(GetZoneID(), GetInstanceID());
if (expedition)
{
expedition->RemoveAllMembers(false); // entity list will teleport clients out immediately
@@ -2722,7 +2722,7 @@ DynamicZone Zone::GetDynamicZone()
return {}; // invalid
}
auto expedition = Expedition::FindCachedExpeditionByInstanceID(GetInstanceID());
auto expedition = Expedition::FindCachedExpeditionByZoneInstance(GetZoneID(), GetInstanceID());
if (expedition)
{
return expedition->GetDynamicZone();