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

Added BlockDataValidator::read5MinusHorizontalFacing()

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-05-18 17:42:03 +01:00
parent b11d3b0401
commit d44ec702b0
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/block/ItemFrame.php
View File

@ -54,7 +54,7 @@ class ItemFrame extends Flowable{
} }
public function readStateFromData(int $id, int $stateMeta) : void{ public function readStateFromData(int $id, int $stateMeta) : void{
$this->facing = BlockDataValidator::readHorizontalFacing(5 - ($stateMeta & 0x03)); $this->facing = BlockDataValidator::read5MinusHorizontalFacing($stateMeta);
$this->hasMap = ($stateMeta & BlockLegacyMetadata::ITEM_FRAME_FLAG_HAS_MAP) !== 0; $this->hasMap = ($stateMeta & BlockLegacyMetadata::ITEM_FRAME_FLAG_HAS_MAP) !== 0;
} }

2
src/pocketmine/block/Stair.php
View File

@ -49,7 +49,7 @@ abstract class Stair extends Transparent{
} }
public function readStateFromData(int $id, int $stateMeta) : void{ public function readStateFromData(int $id, int $stateMeta) : void{
$this->facing = BlockDataValidator::readHorizontalFacing(5 - ($stateMeta & 0x03)); $this->facing = BlockDataValidator::read5MinusHorizontalFacing($stateMeta);
$this->upsideDown = ($stateMeta & BlockLegacyMetadata::STAIR_FLAG_UPSIDE_DOWN) !== 0; $this->upsideDown = ($stateMeta & BlockLegacyMetadata::STAIR_FLAG_UPSIDE_DOWN) !== 0;
} }

2
src/pocketmine/block/Trapdoor.php
View File

@ -47,7 +47,7 @@ abstract class Trapdoor extends Transparent{
public function readStateFromData(int $id, int $stateMeta) : void{ public function readStateFromData(int $id, int $stateMeta) : void{
//TODO: in PC the values are reversed (facing - 2) //TODO: in PC the values are reversed (facing - 2)
$this->facing = BlockDataValidator::readHorizontalFacing(5 - ($stateMeta & 0x03)); $this->facing = BlockDataValidator::read5MinusHorizontalFacing($stateMeta);
$this->top = ($stateMeta & BlockLegacyMetadata::TRAPDOOR_FLAG_UPPER) !== 0; $this->top = ($stateMeta & BlockLegacyMetadata::TRAPDOOR_FLAG_UPPER) !== 0;
$this->open = ($stateMeta & BlockLegacyMetadata::TRAPDOOR_FLAG_OPEN) !== 0; $this->open = ($stateMeta & BlockLegacyMetadata::TRAPDOOR_FLAG_OPEN) !== 0;
} }

10
src/pocketmine/block/utils/BlockDataValidator.php
View File

@ -76,6 +76,16 @@ final class BlockDataValidator{
return self::readHorizontalFacing($facing); return self::readHorizontalFacing($facing);
} }
/**
* @param int $value
*
* @return int
* @throws InvalidBlockStateException
*/
public static function read5MinusHorizontalFacing(int $value) : int{
return self::readHorizontalFacing(5 - ($value & 0x03));
}
public static function readBoundedInt(string $name, int $v, int $min, int $max) : int{ public static function readBoundedInt(string $name, int $v, int $min, int $max) : int{
if($v < $min or $v > $max){ if($v < $min or $v > $max){
throw new InvalidBlockStateException("$name should be in range $min - $max, got $v"); throw new InvalidBlockStateException("$name should be in range $min - $max, got $v");