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

FlowerPot (tile): Allow BlockFactory to determine id/data validity

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-06-08 17:55:50 +01:00
parent 1b629d7ac0
commit f84040a7ad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/block/tile/FlowerPot.php
View File

@ -43,9 +43,10 @@ class FlowerPot extends Spawnable{
public function readSaveData(CompoundTag $nbt) : void{
if($nbt->hasTag(self::TAG_ITEM, ShortTag::class) and $nbt->hasTag(self::TAG_ITEM_DATA, IntTag::class)){
//prevent stupidity with wrong items
if(($id = $nbt->getShort(self::TAG_ITEM)) >= 0 and $id <= 255 and ($data = $nbt->getInt(self::TAG_ITEM_DATA)) >= 0 and $data <= 15){
$this->setPlant(BlockFactory::get($id, $data));
try{
$this->setPlant(BlockFactory::get($nbt->getShort(self::TAG_ITEM), $nbt->getInt(self::TAG_ITEM_DATA)));
}catch(\InvalidArgumentException $e){
//noop
}
}else{
//TODO: new PlantBlock tag