Merge branch 'release/3.3'

This commit is contained in:
Dylan K. Taylor
2018-09-20 16:50:11 +01:00
5 changed files with 26 additions and 11 deletions

View File

@ -68,18 +68,20 @@ class Skull extends Flowable{
return false;
}
public function getDropsForCompatibleTool(Item $item) : array{
private function getItem() : Item{
$tile = $this->level->getTile($this);
if($tile instanceof TileSkull){
return [
ItemFactory::get(Item::SKULL, $tile->getType())
];
}
return ItemFactory::get(Item::SKULL, $tile instanceof TileSkull ? $tile->getType() : 0);
}
return [];
public function getDropsForCompatibleTool(Item $item) : array{
return [$this->getItem()];
}
public function isAffectedBySilkTouch() : bool{
return false;
}
public function getPickedItem() : Item{
return $this->getItem();
}
}