Sky/EQ2Emu
1
0
Fork 0
Code Issues Activity

Allow players to re-enter the original duplicate zone with the transporter selection dialog

Browse Source
This commit is contained in:
Emagi 2024-12-27 09:04:18 -05:00
parent 3200c1d66d
commit 2afc0b8e92
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/WorldServer/client.cpp
View File

@ -4120,10 +4120,8 @@ void Client::SetCurrentZone(int32 id, int32 duplicate_zone_id) {
duplicate_zoning_id = 0; duplicate_zoning_id = 0;
bool foundDupeZone = false; bool foundDupeZone = false;
ZoneChangeDetails zone_details; ZoneChangeDetails zone_details;
if(duplicate_zone_id) {
if(foundDupeZone = zone_list.GetDuplicateZoneDetails(&zone_details, "", id, duplicate_zone_id)) if(foundDupeZone = zone_list.GetDuplicateZoneDetails(&zone_details, "", id, duplicate_zone_id))
duplicate_zoning_id = duplicate_zone_id; duplicate_zoning_id = duplicate_zone_id;
}
if (foundDupeZone || zone_list.GetZone(&zone_details, id, "", true, false, true, false)) { if (foundDupeZone || zone_list.GetZone(&zone_details, id, "", true, false, true, false)) {
SetCurrentZone((ZoneServer*)zone_details.zonePtr); SetCurrentZone((ZoneServer*)zone_details.zonePtr);
@ -10132,7 +10130,8 @@ void Client::ProcessTeleportLocation(EQApplicationPacket* app) {
ZoneChangeDetails zone_details; ZoneChangeDetails zone_details;
bool foundDupeZone = false; bool foundDupeZone = false;
duplicate_zoning_id = 0; duplicate_zoning_id = 0;
if(duplicateId > 0) { int32 additional_zones = zone_list.GetHighestDuplicateID("", destination->destination_zone_id, false);
if(additional_zones) {
if(foundDupeZone = zone_list.GetDuplicateZoneDetails(&zone_details, "", destination->destination_zone_id, duplicateId)) if(foundDupeZone = zone_list.GetDuplicateZoneDetails(&zone_details, "", destination->destination_zone_id, duplicateId))
duplicate_zoning_id = duplicateId; duplicate_zoning_id = duplicateId;
} }