mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

BlockFactory: fixed 0 being assumed to be default if used

Browse Source 
this defeated the whole point of adding this code ...
This commit is contained in:
Dylan K. Taylor 2018-10-20 21:42:34 +01:00
parent 159c3a1a91
commit 742fbc25c3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/block/BlockFactory.php
View File

@ -467,9 +467,8 @@ class BlockFactory{
if(!$override and self::isRegistered($id, $variant)){ if(!$override and self::isRegistered($id, $variant)){
throw new \InvalidArgumentException("Block registration conflicts with an existing block"); throw new \InvalidArgumentException("Block registration conflicts with an existing block");
} }
self::fillStaticArrays(($id << 4) | $variant, $block); //register default state mapped to variant, for blocks which don't use 0 as valid state
for($m = $variant + 1; $m <= ($variant | $stateMask); ++$m){ for($m = $variant; $m <= ($variant | $stateMask); ++$m){
if(($m & ~$stateMask) !== $variant){ if(($m & ~$stateMask) !== $variant){
continue; continue;
} }
@ -486,6 +485,10 @@ class BlockFactory{
self::fillStaticArrays($index, $v); self::fillStaticArrays($index, $v);
} }
} }
if(!self::isRegistered($id, $variant)){
self::fillStaticArrays(($id << 4) | $variant, $block); //register default state mapped to variant, for blocks which don't use 0 as valid state
}
} }
private static function fillStaticArrays(int $index, Block $block) : void{ private static function fillStaticArrays(int $index, Block $block) : void{