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

Block: Get rid of state bitmasks

Browse Source 
This story dates back to the days when getVariantBitmask() was introduced. The purpose of this function was to allow the variant info to be extracted from the metadata, for use with item drops. This was later changed to state bitmask for reasons I don't clearly recall.
In the great 4.0 refactor, we now store variant magic numbers separately, so we don't need any generic bitmask to split up variant and state information anymore. Variant is now only ever serialized and never deserialized. The same thing goes for blockIDs. States are read from the world by matching the full stateID against a table of prefilled known blocks, so the variant doesn't need to be deserialized - only the state does, and the state metadata readers already do bit fuckery by themselves and don't need this mask - notice how little actual changes were required to get rid of this?
This commit is contained in:
Dylan K. Taylor
2019-02-24 14:42:53 +00:00
parent 023fecabac
commit b7b05e729e
53 changed files with 10 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pocketmine/block/Block.php
View File

@ -43,8 +43,6 @@ use pocketmine\Player;
use pocketmine\plugin\Plugin;
use pocketmine\tile\TileFactory;
use function array_merge;
use function assert;
use function dechex;
use function get_class;
use const PHP_INT_MAX;
@ -82,9 +80,6 @@ class Block extends Position implements BlockIds, Metadatable{
* @param string $name English name of the block type (TODO: implement translations)
*/
public function __construct(BlockIdentifier $idInfo, string $name){
if(($idInfo->getVariant() & $this->getStateBitmask()) !== 0){
throw new \InvalidArgumentException("Variant 0x" . dechex($idInfo->getVariant()) . " collides with state bitmask 0x" . dechex($this->getStateBitmask()));
}
$this->idInfo = $idInfo;
$this->fallbackName = $name;
}
@ -123,9 +118,7 @@ class Block extends Position implements BlockIds, Metadatable{
* @return int
*/
public function getDamage() : int{
$stateMeta = $this->writeStateToMeta();
assert(($stateMeta & ~$this->getStateBitmask()) === 0);
return $this->idInfo->getVariant() | $stateMeta;
return $this->idInfo->getVariant() | $this->writeStateToMeta();
}
protected function writeStateToMeta() : int{
@ -168,15 +161,6 @@ class Block extends Position implements BlockIds, Metadatable{
}
}
/**
* Returns a bitmask used to extract state bits from block metadata.
*
* @return int
*/
public function getStateBitmask() : int{
return 0;
}
/**
* Returns whether the given block has an equivalent type to this one. This compares base legacy ID and variant.
*