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

Block: Clean up internal constructor inconsistencies

Browse Source 
I don't dare look how big this commit is or how many bugs it introduced...
This commit is contained in:
Dylan K. Taylor
2019-02-20 19:21:51 +00:00
parent e93464f318
commit 89fce7712a
141 changed files with 427 additions and 1609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,8 +37,8 @@ use function lcg_value;
use function min;
abstract class Liquid extends Transparent{
/** @var int */
private $stillId;
/** @var BlockIdentifierFlattened */
protected $idInfo;
public $adjacentSources = 0;
@ -59,13 +59,12 @@ abstract class Liquid extends Transparent{
/** @var bool */
protected $still = false;
public function __construct(int $id, int $stillId, string $name){
parent::__construct($id, 0, $name);
$this->stillId = $stillId;
public function __construct(BlockIdentifierFlattened $idInfo, string $name){
parent::__construct($idInfo, $name);
}
public function getId() : int{
return $this->still ? $this->stillId : parent::getId();
return $this->still ? $this->idInfo->getSecondId() : parent::getId();
}
protected function writeStateToMeta() : int{