mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 08:44:01 +00:00
Code Issues Projects Releases Wiki Activity

BlockStateUpgradeSchemaUtils: ensure that remapped values are generated in a consistent order

Browse Source 
this uses lexical order, which isn't ideal for numeric values (1, 10, 2, etc), but it's good enough to ensure that the order is stable.
This commit is contained in:
Dylan K. Taylor 2023-04-28 17:12:52 +01:00
parent a8dec1adb1
commit 869c836e2d
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaUtils.php
View File

@ -35,6 +35,7 @@ use pocketmine\utils\Filesystem;
use pocketmine\utils\Utils;
use Symfony\Component\Filesystem\Path;
use function array_map;
use function array_values;
use function count;
use function get_debug_type;
use function gettype;
@ -175,6 +176,7 @@ final class BlockStateUpgradeSchemaUtils{
foreach($remappedValues as $oldNew){
$remappedValuesMap[$oldNew->old->toString()] = $oldNew;
}
ksort($remappedValuesMap);
foreach(Utils::stringifyKeys($dedupTableMap) as $dedupName => $dedupValuesMap){
if(count($remappedValuesMap) !== count($dedupValuesMap)){
@ -199,7 +201,7 @@ final class BlockStateUpgradeSchemaUtils{
//no match, add the values to the table
$newDedupName = $propertyName . "_" . str_pad(strval($counter++), 2, "0", STR_PAD_LEFT);
$dedupTableMap[$newDedupName] = $remappedValuesMap;
$dedupTable[$newDedupName] = $remappedValues;
$dedupTable[$newDedupName] = array_values($remappedValuesMap);
$dedupMapping[$blockName][$propertyName] = $newDedupName;
}
}