mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-21 02:16:33 +00:00
Code Issues Projects Releases Wiki Activity

tools/generate-blockstate-upgrade-schema: do not optimize state remaps with unchanged IDs

Browse Source 
processRemappedStates() needs to know about the full set of states to generate reliable mappings.
Without it, it may generate flattening rules or state matching criteria that unintentionally match states that it's not aware of.
Sadly, this does make some schemas bigger, but it's for the best.
This commit is contained in:
Dylan K. Taylor 2023-11-08 15:18:46 +00:00
parent 6b5c405939
commit 8ccaf907d1
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/generate-blockstate-upgrade-schema.php
View File

@ -37,7 +37,6 @@ use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer;
use pocketmine\utils\AssumptionFailedError; use pocketmine\utils\AssumptionFailedError;
use pocketmine\utils\Filesystem; use pocketmine\utils\Filesystem;
use pocketmine\utils\Utils; use pocketmine\utils\Utils;
use function array_filter;
use function array_key_first; use function array_key_first;
use function array_keys; use function array_keys;
use function array_map; use function array_map;
@ -481,16 +480,9 @@ function generateBlockStateUpgradeSchema(array $upgradeTable) : BlockStateUpgrad
throw new \RuntimeException("States with the same ID should be fully consistent"); throw new \RuntimeException("States with the same ID should be fully consistent");
} }
}else{ }else{
if(isset($newNameFound[$oldName])){
//some of the states stayed under the same ID - we can process these as normal states
$stateGroup = array_filter($blockStateMappings, fn(BlockStateMapping $m) => $m->new->getName() === $oldName);
if(processStateGroup($oldName, $stateGroup, $result)){
foreach(Utils::stringifyKeys($stateGroup) as $k => $mapping){
unset($blockStateMappings[$k]);
}
}
}
//block mapped to multiple different new IDs; we can't guess these, so we just do a plain old remap //block mapped to multiple different new IDs; we can't guess these, so we just do a plain old remap
//even if some of the states stay under the same ID, the compression techniques used by this function
//implicitly rely on knowing the full set of old states and their new transformations
$result->remappedStates[$oldName] = processRemappedStates($blockStateMappings); $result->remappedStates[$oldName] = processRemappedStates($blockStateMappings);
} }
} }