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

FenceGate: implement in-wall checks

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-02-18 19:00:58 +00:00
parent 6f7c63e2a8
commit a95ecb3ff9
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pocketmine/block/FenceGate.php
View File

@ -37,18 +37,21 @@ class FenceGate extends Transparent{
protected $open = false; protected $open = false;
/** @var int */ /** @var int */
protected $facing = Facing::NORTH; protected $facing = Facing::NORTH;
/** @var bool */
protected $inWall = false;
protected function writeStateToMeta() : int{ protected function writeStateToMeta() : int{
return Bearing::fromFacing($this->facing) | ($this->open ? 0x04 : 0); return Bearing::fromFacing($this->facing) | ($this->open ? 0x04 : 0) | ($this->inWall ? 0x08 : 0);
} }
public function readStateFromMeta(int $meta) : void{ public function readStateFromMeta(int $meta) : void{
$this->facing = BlockDataValidator::readLegacyHorizontalFacing($meta & 0x03); $this->facing = BlockDataValidator::readLegacyHorizontalFacing($meta & 0x03);
$this->open = ($meta & 0x04) !== 0; $this->open = ($meta & 0x04) !== 0;
$this->inWall = ($meta & 0x08) !== 0;
} }
public function getStateBitmask() : int{ public function getStateBitmask() : int{
return 0b111; return 0b1111;
} }
public function getHardness() : float{ public function getHardness() : float{
@ -68,14 +71,31 @@ class FenceGate extends Transparent{
return AxisAlignedBB::one()->extend(Facing::UP, 0.5)->squash(Facing::axis($this->facing), 6 / 16); return AxisAlignedBB::one()->extend(Facing::UP, 0.5)->squash(Facing::axis($this->facing), 6 / 16);
} }
private function checkInWall() : bool{
return (
$this->getSide(Facing::rotateY($this->facing, false)) instanceof CobblestoneWall or
$this->getSide(Facing::rotateY($this->facing, true)) instanceof CobblestoneWall
);
}
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{ public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
if($player !== null){ if($player !== null){
$this->facing = $player->getHorizontalFacing(); $this->facing = $player->getHorizontalFacing();
} }
$this->inWall = $this->checkInWall();
return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player); return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player);
} }
public function onNearbyBlockChange() : void{
$inWall = $this->checkInWall();
if($inWall !== $this->inWall){
$this->inWall = $inWall;
$this->level->setBlock($this, $this);
}
}
public function onActivate(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{ public function onActivate(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
$this->open = !$this->open; $this->open = !$this->open;
if($this->open and $player !== null){ if($this->open and $player !== null){