yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Zones/Locations

Browse Source 
* fixed Quick Info defaulting expansion maps to have [0, 0, 0] as parent
 * corrected looking for custom excluded flag when collecting instances for area
This commit is contained in:
Sarjuuk
2022-03-08 18:52:01 +01:00
parent 012ebe578b
commit 3a98201837
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/zone.php
View File

@@ -109,7 +109,7 @@ class ZonePage extends GenericPage
} }
// Instances // Instances
if ($_ = DB::Aowow()->selectCol('SELECT id FROM ?_zones WHERE parentAreaId = ?d AND (flags & ?d) = 0', $this->typeId, CUSTOM_EXCLUDE_FOR_LISTVIEW)) if ($_ = DB::Aowow()->selectCol('SELECT `id` FROM ?_zones WHERE `parentAreaId` = ?d AND (`cuFlags` & ?d) = 0', $this->typeId, CUSTOM_EXCLUDE_FOR_LISTVIEW))
{ {
$this->extendGlobalIds(TYPE_ZONE, ...$_); $this->extendGlobalIds(TYPE_ZONE, ...$_);
$infobox[] = Lang::maps('Instances').Lang::main('colon')."\n[zone=".implode("], \n[zone=", $_).']'; $infobox[] = Lang::maps('Instances').Lang::main('colon')."\n[zone=".implode("], \n[zone=", $_).']';

2
setup/tools/sqlgen/zones.func.php
View File

@@ -115,7 +115,7 @@ SqlGen::register(new class extends SetupScript
foreach ($baseData as &$bd) foreach ($baseData as &$bd)
{ {
if (!in_array($bd['parentMapId'], [0, 1, 530, 571])) if (in_array($bd['mapBak'], [0, 1, 530, 571]))
continue; continue;
if ($gPos = Game::worldPosToZonePos($bd['parentMapId'], $bd['parentY'], $bd['parentX'])) if ($gPos = Game::worldPosToZonePos($bd['parentMapId'], $bd['parentY'], $bd['parentX']))