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

Merge branch 'master' into api3/network

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-03-18 16:29:38 +00:00
parent 0d37d0d896 116cba9fae
commit 8114ceaf68
21 changed files with 495 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/tile/FlowerPot.php
View File

@ -40,7 +40,7 @@ class FlowerPot extends Spawnable{
parent::__construct($level, $nbt);
}
public function canAddItem(Item $item): bool{
public function canAddItem(Item $item) : bool{
if(!$this->isEmpty()){
return false;
}
@ -63,7 +63,7 @@ class FlowerPot extends Spawnable{
}
}
public function getItem(): Item{
public function getItem() : Item{
return Item::get((int) ($this->namedtag["item"] ?? 0), (int) ($this->namedtag["mData"] ?? 0), 1);
}
@ -77,11 +77,11 @@ class FlowerPot extends Spawnable{
$this->setItem(Item::get(Item::AIR));
}
public function isEmpty(): bool{
public function isEmpty() : bool{
return $this->getItem()->getId() === Item::AIR;
}
public function getSpawnCompound(): CompoundTag{
public function getSpawnCompound() : CompoundTag{
return new CompoundTag("", [
new StringTag("id", Tile::FLOWER_POT),
new IntTag("x", (int) $this->x),

5
src/pocketmine/tile/Tile.php
View File

@ -173,11 +173,14 @@ abstract class Tile extends Position{
unset($this->level->updateTiles[$this->id]);
if($this->chunk instanceof Chunk){
$this->chunk->removeTile($this);
$this->chunk = null;
}
if(($level = $this->getLevel()) instanceof Level){
$level->removeTile($this);
$this->setLevel(null);
}
$this->level = null;
$this->namedtag = null;
}
}