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

PillarRotationTrait: Allow axis shift to be defined by the includer

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-05-16 18:02:03 +01:00
parent dd914e0752
commit f7a9da4e92
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,10 @@ trait PillarRotationTrait{
/** @var int */ /** @var int */
protected $axis = Facing::AXIS_Y; protected $axis = Facing::AXIS_Y;
protected function getAxisMetaShift() : int{
return 2; //default
}
/** /**
* @see Block::writeStateToMeta() * @see Block::writeStateToMeta()
* @return int * @return int
@ -57,7 +61,7 @@ trait PillarRotationTrait{
* @return int * @return int
*/ */
public function getStateBitmask() : int{ public function getStateBitmask() : int{
return 0b1100; return 0b11 << $this->getAxisMetaShift();
} }
protected function readAxisFromMeta(int $meta) : void{ protected function readAxisFromMeta(int $meta) : void{
@ -66,7 +70,7 @@ trait PillarRotationTrait{
1 => Facing::AXIS_X, 1 => Facing::AXIS_X,
2 => Facing::AXIS_Z 2 => Facing::AXIS_Z
]; ];
$axis = $meta >> 2; $axis = $meta >> $this->getAxisMetaShift();
if(!isset($map[$axis])){ if(!isset($map[$axis])){
throw new InvalidBlockStateException("Invalid axis meta $axis"); throw new InvalidBlockStateException("Invalid axis meta $axis");
} }
@ -79,7 +83,7 @@ trait PillarRotationTrait{
Facing::AXIS_Z => 2, Facing::AXIS_Z => 2,
Facing::AXIS_X => 1 Facing::AXIS_X => 1
]; ];
return $bits[$this->axis] << 2; return $bits[$this->axis] << $this->getAxisMetaShift();
} }
/** /**