Cross-zone signal fixups

Vanifac · Dec 30, 2023 · f814b91 · f814b91
1 parent 3f3beb1
commit f814b91
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp
@@ -1242,15 +1242,15 @@ void QuestManager::itemlink(int item_id) {
 
 void QuestManager::signalwith(int npc_id, int signal_id, int wait_ms, const char* data)
 {
-	if (npc_id < 1000 || npc_id / 1000 == zone->GetZoneID())
+	if (npc_id < 1000 || npc_id / 1000 == zone->GetZoneID() || npc_id / 1000 == database.GetClientZoneID(zone->GetZoneID()))
 		STimerList.push_back(SignalTimer(wait_ms < 0 ? 0 : wait_ms, npc_id, signal_id, data));
 	else
 		CrossZoneSignalNPCByNPCTypeID(npc_id, signal_id, data);
 }
 
 void QuestManager::signal(int npc_id, int wait_ms)
 {
-	if (npc_id < 1000 || npc_id / 1000 == zone->GetZoneID())
+	if (npc_id < 1000 || npc_id / 1000 == zone->GetZoneID() || npc_id / 1000 == database.GetClientZoneID(zone->GetZoneID()))
 		signalwith(npc_id, 0, wait_ms);
 	else
 		CrossZoneSignalNPCByNPCTypeID(npc_id, 0);