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

Vine: use facing as both keys and values

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-04-27 15:19:55 +01:00
parent 845819123d
commit 017ca55a58
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/block/Vine.php
View File

@ -35,7 +35,7 @@ use function count;
class Vine extends Flowable{ class Vine extends Flowable{
/** @var bool[] */ /** @var int[] */
protected $faces = []; protected $faces = [];
public function __construct(BlockIdentifier $idInfo, string $name, ?BlockBreakInfo $breakInfo = null){ public function __construct(BlockIdentifier $idInfo, string $name, ?BlockBreakInfo $breakInfo = null){
@ -63,7 +63,7 @@ class Vine extends Flowable{
private function setFaceFromMeta(int $meta, int $flag, int $face) : void{ private function setFaceFromMeta(int $meta, int $flag, int $face) : void{
if(($meta & $flag) !== 0){ if(($meta & $flag) !== 0){
$this->faces[$face] = true; $this->faces[$face] = $face;
}else{ }else{
unset($this->faces[$face]); unset($this->faces[$face]);
} }
@ -96,7 +96,7 @@ class Vine extends Flowable{
} }
$this->faces = $blockReplace instanceof Vine ? $blockReplace->faces : []; $this->faces = $blockReplace instanceof Vine ? $blockReplace->faces : [];
$this->faces[Facing::opposite($face)] = true; $this->faces[Facing::opposite($face)] = Facing::opposite($face);
return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player); return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
} }
@ -108,7 +108,7 @@ class Vine extends Flowable{
//check which faces have corresponding vines in the block above //check which faces have corresponding vines in the block above
$supportedFaces = $up instanceof Vine ? array_intersect_key($this->faces, $up->faces) : []; $supportedFaces = $up instanceof Vine ? array_intersect_key($this->faces, $up->faces) : [];
foreach($this->faces as $face => $bool){ foreach($this->faces as $face){
if(!isset($supportedFaces[$face]) and !$this->getSide($face)->isSolid()){ if(!isset($supportedFaces[$face]) and !$this->getSide($face)->isSolid()){
unset($this->faces[$face]); unset($this->faces[$face]);
$changed = true; $changed = true;