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

first shot making Block not extend Position

Browse Source 
this makes some stuff a lot less pretty, but this seems to be the bare minimum necessary to do this task. It can be enhanced later.
This commit is contained in:
Dylan K. Taylor
2019-08-05 16:44:09 +01:00
parent cf271dab2b
commit 53ab860db5
75 changed files with 337 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/block/ItemFrame.php
View File

@ -61,7 +61,7 @@ class ItemFrame extends Flowable{
public function readStateFromWorld() : void{
parent::readStateFromWorld();
$tile = $this->world->getTile($this);
$tile = $this->pos->getWorld()->getTile($this->pos);
if($tile instanceof TileItemFrame){
$this->framedItem = $tile->getItem();
if($this->framedItem->isNull()){
@ -74,7 +74,7 @@ class ItemFrame extends Flowable{
public function writeStateToWorld() : void{
parent::writeStateToWorld();
$tile = $this->world->getTile($this);
$tile = $this->pos->getWorld()->getTile($this->pos);
if($tile instanceof TileItemFrame){
$tile->setItem($this->framedItem);
$tile->setItemRotation($this->itemRotation);
@ -156,7 +156,7 @@ class ItemFrame extends Flowable{
return true;
}
$this->world->setBlock($this, $this);
$this->pos->getWorld()->setBlock($this->pos, $this);
return true;
}
@ -166,16 +166,16 @@ class ItemFrame extends Flowable{
return false;
}
if(lcg_value() <= $this->itemDropChance){
$this->world->dropItem($this->add(0.5, 0.5, 0.5), $this->getFramedItem());
$this->pos->getWorld()->dropItem($this->pos->add(0.5, 0.5, 0.5), $this->getFramedItem());
}
$this->setFramedItem(null);
$this->world->setBlock($this, $this);
$this->pos->getWorld()->setBlock($this->pos, $this);
return true;
}
public function onNearbyBlockChange() : void{
if(!$this->getSide(Facing::opposite($this->facing))->isSolid()){
$this->world->useBreakOn($this);
$this->pos->getWorld()->useBreakOn($this->pos);
}
}