mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 19:02:59 +00:00
Code Issues Projects Releases Wiki Activity

Flatten still liquid blocks into a liquid block property

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-11-30 16:06:35 +00:00
parent ed531c0009
commit a2253e9e7d
6 changed files with 39 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/pocketmine/block/Liquid.php
View File

@ -31,6 +31,8 @@ use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
abstract class Liquid extends Transparent{
/** @var int */
private $stillId;
public $adjacentSources = 0;
@ -48,6 +50,17 @@ abstract class Liquid extends Transparent{
protected $falling = false;
/** @var int */
protected $decay = 0; //PC "level" property
/** @var bool */
protected $still = false;
public function __construct(int $id, int $stillId, string $name){
parent::__construct($id, 0, $name);
$this->stillId = $stillId;
}
public function getId() : int{
return $this->still ? $this->stillId : parent::getId();
}
protected function writeStateToMeta() : int{
return $this->decay | ($this->falling ? 0x08 : 0);
@ -94,9 +107,17 @@ abstract class Liquid extends Transparent{
return [];
}
abstract public function getStillForm() : Block;
public function getStillForm() : Block{
$b = clone $this;
$b->still = true;
return $b;
}
abstract public function getFlowingForm() : Block;
public function getFlowingForm() : Block{
$b = clone $this;
$b->still = false;
return $b;
}
abstract public function getBucketFillSound() : int;
@ -110,6 +131,14 @@ abstract class Liquid extends Transparent{
return (($this->falling ? 0 : $this->decay) + 1) / 9;
}
public function isStill() : bool{
return $this->still;
}
public function setStill(bool $still = true) : void{
$this->still = $still;
}
protected function getEffectiveFlowDecay(Block $block) : int{
if(!($block instanceof Liquid) or !$block->isSameType($this)){
return -1;