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

BlockFactory: Register block to id|variant without setting state to allow non-zero default states

Browse Source 
This will be needed to deal with things like chest/furnace which don't use 0 as a valid state (these both use facing horizontal for rotation, and vertical is invalid, so 0 would mean downwards facing which is invalid.
This commit is contained in:
Dylan K. Taylor 2018-10-12 20:05:44 +01:00
parent 0520598584
commit 7af7783cc8
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -464,7 +464,9 @@ class BlockFactory{
throw new \InvalidArgumentException("Block variant collides with state bitmask");
}
for($m = $variant; $m <= ($variant | $stateMask); ++$m){
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){
if(($m & ~$stateMask) !== $variant){
continue;
}
@ -478,15 +480,19 @@ class BlockFactory{
$v = clone $block;
$v->readStateFromMeta($m & $stateMask);
if($v->getDamage() === $m){ //don't register anything that isn't the same when we read it back again
self::$fullList[$index] = $v;
self::$stateMasks[$index] = $stateMask;
self::$lightFilter[$index] = min(15, $v->getLightFilter() + 1); //opacity plus 1 standard light filter
self::$diffusesSkyLight[$index] = $v->diffusesSkyLight();
self::$blastResistance[$index] = $v->getBlastResistance();
self::fillStaticArrays($index, $v);
}
}
}
private static function fillStaticArrays(int $index, Block $block) : void{
self::$fullList[$index] = $block;
self::$stateMasks[$index] = $block->getStateBitmask();
self::$lightFilter[$index] = min(15, $block->getLightFilter() + 1); //opacity plus 1 standard light filter
self::$diffusesSkyLight[$index] = $block->diffusesSkyLight();
self::$blastResistance[$index] = $block->getBlastResistance();
}
/**
* Returns a new Block instance with the specified ID, meta and position.
*