mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 10:22:56 +00:00
Code Issues Projects Releases Wiki Activity

Removed FlowerPot update_bit hack

Browse Source
This commit is contained in:
Dylan K. Taylor
2021-07-19 17:39:35 +01:00
parent 5874ce582a
commit 71df15b4cc
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/block/FlowerPot.php
View File

@ -34,22 +34,15 @@ use function assert;
class FlowerPot extends Flowable{
/**
* TODO: get rid of this hack (it's currently needed to deal with blockfactory state handling)
*/
protected bool $occupied = false;
protected ?Block $plant = null;
protected function writeStateToMeta() : int{
return $this->occupied ? BlockLegacyMetadata::FLOWER_POT_FLAG_OCCUPIED : 0;
}
public function readStateFromData(int $id, int $stateMeta) : void{
$this->occupied = ($stateMeta & BlockLegacyMetadata::FLOWER_POT_FLAG_OCCUPIED) !== 0;
//TODO: HACK! this is just to make the client actually render the plant - we purposely don't read the flag back
return $this->plant !== null ? BlockLegacyMetadata::FLOWER_POT_FLAG_OCCUPIED : 0;
}
public function getStateBitmask() : int{
return 0b1111; //vanilla uses various values, we only care about 1 and 0 for PE
return 0b1;
}
public function readStateFromWorld() : void{
@ -58,7 +51,7 @@ class FlowerPot extends Flowable{
if($tile instanceof TileFlowerPot){
$this->setPlant($tile->getPlant());
}else{
$this->occupied = false;
$this->setPlant(null);
}
}
@ -81,7 +74,6 @@ class FlowerPot extends Flowable{
}else{
$this->plant = clone $plant;
}
$this->occupied = $this->plant !== null;
return $this;
}