Clean up ID flattening hacks

This commit is contained in:
Dylan K. Taylor
2019-02-21 10:38:29 +00:00
parent 89fce7712a
commit 635fb5dde4
59 changed files with 231 additions and 212 deletions

View File

@ -71,9 +71,10 @@ abstract class Liquid extends Transparent{
return $this->decay | ($this->falling ? 0x08 : 0);
}
public function readStateFromMeta(int $meta) : void{
$this->decay = BlockDataValidator::readBoundedInt("decay", $meta & 0x07, 0, 7);
$this->falling = ($meta & 0x08) !== 0;
public function readStateFromData(int $id, int $stateMeta) : void{
$this->decay = BlockDataValidator::readBoundedInt("decay", $stateMeta & 0x07, 0, 7);
$this->falling = ($stateMeta & 0x08) !== 0;
$this->still = $id === $this->idInfo->getSecondId();
}
public function getStateBitmask() : int{