Merge branch 'master' into mcpe-1.2

This commit is contained in:
Dylan K. Taylor
2017-08-08 10:23:19 +01:00
35 changed files with 372 additions and 254 deletions

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class Bed extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::BED_BLOCK);
$this->block = Block::get(Block::BED_BLOCK);
parent::__construct(self::BED, $meta, $count, "Bed");
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class BeetrootSeeds extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::BEETROOT_BLOCK);
$this->block = Block::get(Block::BEETROOT_BLOCK);
parent::__construct(self::BEETROOT_SEEDS, $meta, $count, "Beetroot Seeds");
}
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class Cake extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::CAKE_BLOCK);
$this->block = Block::get(Block::CAKE_BLOCK);
parent::__construct(self::CAKE, $meta, $count, "Cake");
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class Carrot extends Food{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::CARROT_BLOCK);
$this->block = Block::get(Block::CARROT_BLOCK);
parent::__construct(self::CARROT, $meta, $count, "Carrot");
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class FlowerPot extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::FLOWER_POT_BLOCK);
$this->block = Block::get(Block::FLOWER_POT_BLOCK);
parent::__construct(self::FLOWER_POT, $meta, $count, "Flower Pot");
}
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class IronDoor extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::IRON_DOOR_BLOCK);
$this->block = Block::get(Block::IRON_DOOR_BLOCK);
parent::__construct(self::IRON_DOOR, $meta, $count, "Iron Door");
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class MelonSeeds extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::MELON_STEM);
$this->block = Block::get(Block::MELON_STEM);
parent::__construct(self::MELON_SEEDS, $meta, $count, "Melon Seeds");
}
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class Potato extends Food{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::POTATO_BLOCK);
$this->block = Block::get(Block::POTATO_BLOCK);
parent::__construct(self::POTATO, $meta, $count, "Potato");
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class PumpkinSeeds extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::PUMPKIN_STEM);
$this->block = Block::get(Block::PUMPKIN_STEM);
parent::__construct(self::PUMPKIN_SEEDS, $meta, $count, "Pumpkin Seeds");
}
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class Sign extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::SIGN_POST);
$this->block = Block::get(Block::SIGN_POST);
parent::__construct(self::SIGN, $meta, $count, "Sign");
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class Skull extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::SKULL_BLOCK);
$this->block = Block::get(Block::SKULL_BLOCK);
parent::__construct(self::SKULL, $meta, $count, "Mob Head");
}
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class Sugarcane extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::SUGARCANE_BLOCK);
$this->block = Block::get(Block::SUGARCANE_BLOCK);
parent::__construct(self::SUGARCANE, $meta, $count, "Sugar Cane");
}
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class WheatSeeds extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::WHEAT_BLOCK);
$this->block = Block::get(Block::WHEAT_BLOCK);
parent::__construct(self::WHEAT_SEEDS, $meta, $count, "Wheat Seeds");
}
}

View File

@ -27,7 +27,7 @@ use pocketmine\block\Block;
class WoodenDoor extends Item{
public function __construct($meta = 0, $count = 1){
$this->block = Block::get(Item::WOODEN_DOOR_BLOCK);
$this->block = Block::get(Block::WOODEN_DOOR_BLOCK);
parent::__construct(self::WOODEN_DOOR, $meta, $count, "Wooden Door");
}