mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-08-26 21:18:43 +00:00
Code Issues Projects Releases Wiki Activity

CocoaBlock: deduplicate attachment condition checking

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-02-06 19:34:52 +00:00
parent 9ab3c57789
commit 82bb83211f
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/block/CocoaBlock.php
View File

@ -85,8 +85,12 @@ class CocoaBlock extends Transparent{
]; ];
} }
private function canAttachTo(Block $block) : bool{
return $block instanceof Wood && $block->getTreeType()->equals(TreeType::JUNGLE());
}
public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{ public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
if(Facing::axis($face) !== Axis::Y and $blockClicked instanceof Wood and $blockClicked->getTreeType()->equals(TreeType::JUNGLE())){ if(Facing::axis($face) !== Axis::Y and $this->canAttachTo($blockClicked)){
$this->facing = $face; $this->facing = $face;
return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player); return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
} }
@ -108,8 +112,7 @@ class CocoaBlock extends Transparent{
} }
public function onNearbyBlockChange() : void{ public function onNearbyBlockChange() : void{
$side = $this->getSide(Facing::opposite($this->facing)); if(!$this->canAttachTo($this->getSide(Facing::opposite($this->facing)))){
if(!($side instanceof Wood) or !$side->getTreeType()->equals(TreeType::JUNGLE())){
$this->pos->getWorld()->useBreakOn($this->pos); $this->pos->getWorld()->useBreakOn($this->pos);
} }
} }