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

Use dynamic state detection to localize stateinfo stored in tiles (hack)

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-10-28 20:00:43 +00:00
parent 3af293f024
commit 3f3bdaeba5
15 changed files with 81 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/pocketmine/block/Skull.php
View File

@ -39,6 +39,10 @@ class Skull extends Flowable{
/** @var int */
protected $facing = Facing::NORTH;
protected $type = TileSkull::TYPE_SKELETON;
/** @var int */
protected $rotation = 0; //TODO: split this into floor skull and wall skull handling
public function __construct(){
}
@ -55,6 +59,15 @@ class Skull extends Flowable{
return 0b111;
}
public function updateState() : void{
parent::updateState();
$tile = $this->level->getTile($this);
if($tile instanceof TileSkull){
$this->type = $tile->getType();
$this->rotation = $tile->getRotation();
}
}
public function getHardness() : float{
return 1;
}
@ -74,8 +87,17 @@ class Skull extends Flowable{
}
$this->facing = $face;
$this->type = $item->getDamage(); //TODO: replace this with a proper variant getter
if($player !== null and $face === Facing::UP){
$this->rotation = ((int) floor(($player->yaw * 16 / 360) + 0.5)) & 0xf;
}
if(parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player)){
Tile::createTile(Tile::SKULL, $this->getLevel(), TileSkull::createNBT($this, $face, $item, $player));
//TODO: make this automatic on block set
$tile = Tile::createTile(Tile::SKULL, $this->getLevel(), TileSkull::createNBT($this));
if($tile instanceof TileSkull){
$tile->setRotation($this->rotation);
$tile->setType($this->type);
}
return true;
}
@ -83,8 +105,7 @@ class Skull extends Flowable{
}
public function getItem() : Item{
$tile = $this->level->getTile($this);
return ItemFactory::get(Item::SKULL, $tile instanceof TileSkull ? $tile->getType() : 0);
return ItemFactory::get(Item::SKULL, $this->type);
}
public function isAffectedBySilkTouch() : bool{