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

Merge branch 'master' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-17 17:14:16 +01:00
parent 643e10037c 83f29e5639
commit 4f1302adf2
215 changed files with 1482 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pocketmine/item/Item.php
View File

@ -28,7 +28,6 @@ namespace pocketmine\item;
use pocketmine\block\Block;
use pocketmine\entity\Entity;
use pocketmine\inventory\Fuel;
use pocketmine\item\enchantment\Enchantment;
use pocketmine\level\Level;
use pocketmine\nbt\NBT;
@ -437,11 +436,8 @@ class Item implements ItemIds, \JsonSerializable{
}
$tag = $this->getNamedTag();
if(isset($tag->BlockEntityTag) and $tag->BlockEntityTag instanceof CompoundTag){
return true;
}
return false;
return isset($tag->BlockEntityTag) and $tag->BlockEntityTag instanceof CompoundTag;
}
public function clearCustomBlockData(){
@ -924,15 +920,12 @@ class Item implements ItemIds, \JsonSerializable{
return 64;
}
final public function getFuelTime(){
if(!isset(Fuel::$duration[$this->id])){
return null;
}
if($this->id !== self::BUCKET or $this->meta === 10){
return Fuel::$duration[$this->id];
}
return null;
/**
* Returns the time in ticks which the item will fuel a furnace for.
* @return int
*/
public function getFuelTime() : int{
return 0;
}
/**