diff --git a/src/pocketmine/block/Anvil.php b/src/pocketmine/block/Anvil.php index 4c3114bd4..73c2e6c0f 100644 --- a/src/pocketmine/block/Anvil.php +++ b/src/pocketmine/block/Anvil.php @@ -71,7 +71,7 @@ class Anvil extends Fallable{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [$this->id, 0, 1], //TODO break level ]; diff --git a/src/pocketmine/block/Bricks.php b/src/pocketmine/block/Bricks.php index ef73423b9..d639cc042 100644 --- a/src/pocketmine/block/Bricks.php +++ b/src/pocketmine/block/Bricks.php @@ -49,7 +49,7 @@ class Bricks extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::BRICKS_BLOCK, 0, 1], ]; diff --git a/src/pocketmine/block/BurningFurnace.php b/src/pocketmine/block/BurningFurnace.php index 18d028e73..ed12a40b6 100644 --- a/src/pocketmine/block/BurningFurnace.php +++ b/src/pocketmine/block/BurningFurnace.php @@ -135,7 +135,7 @@ class BurningFurnace extends Solid{ public function getDrops(Item $item){ $drops = []; - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ $drops[] = [Item::FURNACE, 0, 1]; } diff --git a/src/pocketmine/block/Coal.php b/src/pocketmine/block/Coal.php index 75e4fb0d4..494534dcf 100644 --- a/src/pocketmine/block/Coal.php +++ b/src/pocketmine/block/Coal.php @@ -45,7 +45,7 @@ class Coal extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::COAL_BLOCK, 0, 1], ]; diff --git a/src/pocketmine/block/CoalOre.php b/src/pocketmine/block/CoalOre.php index 964ed7647..6c1a78e76 100644 --- a/src/pocketmine/block/CoalOre.php +++ b/src/pocketmine/block/CoalOre.php @@ -45,7 +45,7 @@ class CoalOre extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::COAL, 0, 1], ]; diff --git a/src/pocketmine/block/Cobblestone.php b/src/pocketmine/block/Cobblestone.php index 0a41aa186..5954edbba 100644 --- a/src/pocketmine/block/Cobblestone.php +++ b/src/pocketmine/block/Cobblestone.php @@ -45,7 +45,7 @@ class Cobblestone extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::COBBLESTONE, 0, 1], ]; diff --git a/src/pocketmine/block/Diamond.php b/src/pocketmine/block/Diamond.php index cbe924c95..1fd175dca 100644 --- a/src/pocketmine/block/Diamond.php +++ b/src/pocketmine/block/Diamond.php @@ -45,7 +45,7 @@ class Diamond extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 4){ + if($item->isPickaxe() >= Tool::TIER_IRON){ return [ [Item::DIAMOND_BLOCK, 0, 1], ]; diff --git a/src/pocketmine/block/DiamondOre.php b/src/pocketmine/block/DiamondOre.php index e9b9466db..c05abb384 100644 --- a/src/pocketmine/block/DiamondOre.php +++ b/src/pocketmine/block/DiamondOre.php @@ -45,7 +45,7 @@ class DiamondOre extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 4){ + if($item->isPickaxe() >= Tool::TIER_IRON){ return [ [Item::DIAMOND, 0, 1], ]; diff --git a/src/pocketmine/block/DoubleSlab.php b/src/pocketmine/block/DoubleSlab.php index cf037e961..3ccdcf84b 100644 --- a/src/pocketmine/block/DoubleSlab.php +++ b/src/pocketmine/block/DoubleSlab.php @@ -55,7 +55,7 @@ class DoubleSlab extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::SLAB, $this->meta & 0x07, 2], ]; diff --git a/src/pocketmine/block/Emerald.php b/src/pocketmine/block/Emerald.php index b5db557e0..2f24e34c5 100644 --- a/src/pocketmine/block/Emerald.php +++ b/src/pocketmine/block/Emerald.php @@ -45,7 +45,7 @@ class Emerald extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 4){ + if($item->isPickaxe() >= Tool::TIER_IRON){ return [ [Item::EMERALD_BLOCK, 0, 1], ]; diff --git a/src/pocketmine/block/EmeraldOre.php b/src/pocketmine/block/EmeraldOre.php index 54971f3b4..90fac45c3 100644 --- a/src/pocketmine/block/EmeraldOre.php +++ b/src/pocketmine/block/EmeraldOre.php @@ -45,7 +45,7 @@ class EmeraldOre extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 4){ + if($item->isPickaxe() >= Tool::TIER_IRON){ return [ [Item::EMERALD, 0, 1], ]; diff --git a/src/pocketmine/block/EnchantingTable.php b/src/pocketmine/block/EnchantingTable.php index f65c5f8bc..5890367ab 100644 --- a/src/pocketmine/block/EnchantingTable.php +++ b/src/pocketmine/block/EnchantingTable.php @@ -97,7 +97,7 @@ class EnchantingTable extends Transparent{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [$this->id, 0, 1], ]; diff --git a/src/pocketmine/block/GlowingRedstoneOre.php b/src/pocketmine/block/GlowingRedstoneOre.php index a1675fc02..095241607 100644 --- a/src/pocketmine/block/GlowingRedstoneOre.php +++ b/src/pocketmine/block/GlowingRedstoneOre.php @@ -60,7 +60,7 @@ class GlowingRedstoneOre extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 4){ + if($item->isPickaxe() >= Tool::TIER_IRON){ return [ [Item::REDSTONE_DUST, 0, mt_rand(4, 5)], ]; diff --git a/src/pocketmine/block/Gold.php b/src/pocketmine/block/Gold.php index cb9421124..62b942f53 100644 --- a/src/pocketmine/block/Gold.php +++ b/src/pocketmine/block/Gold.php @@ -45,7 +45,7 @@ class Gold extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 4){ + if($item->isPickaxe() >= Tool::TIER_IRON){ return [ [Item::GOLD_BLOCK, 0, 1], ]; diff --git a/src/pocketmine/block/GoldOre.php b/src/pocketmine/block/GoldOre.php index 5c87c16d4..c56cff977 100644 --- a/src/pocketmine/block/GoldOre.php +++ b/src/pocketmine/block/GoldOre.php @@ -45,7 +45,7 @@ class GoldOre extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 4){ + if($item->isPickaxe() >= Tool::TIER_IRON){ return [ [Item::GOLD_ORE, 0, 1], ]; diff --git a/src/pocketmine/block/Iron.php b/src/pocketmine/block/Iron.php index 66a2c28ee..2ffc4cd6a 100644 --- a/src/pocketmine/block/Iron.php +++ b/src/pocketmine/block/Iron.php @@ -45,7 +45,7 @@ class Iron extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 3){ + if($item->isPickaxe() >= Tool::TIER_STONE){ return [ [Item::IRON_BLOCK, 0, 1], ]; diff --git a/src/pocketmine/block/IronBars.php b/src/pocketmine/block/IronBars.php index bebe0f3a2..b5e70e873 100644 --- a/src/pocketmine/block/IronBars.php +++ b/src/pocketmine/block/IronBars.php @@ -45,7 +45,7 @@ class IronBars extends Thin{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::IRON_BARS, 0, 1], ]; diff --git a/src/pocketmine/block/IronDoor.php b/src/pocketmine/block/IronDoor.php index 447b723f9..70195b9a9 100644 --- a/src/pocketmine/block/IronDoor.php +++ b/src/pocketmine/block/IronDoor.php @@ -45,7 +45,7 @@ class IronDoor extends Door{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::IRON_DOOR, 0, 1], ]; diff --git a/src/pocketmine/block/IronOre.php b/src/pocketmine/block/IronOre.php index 01e8be86d..cda415136 100644 --- a/src/pocketmine/block/IronOre.php +++ b/src/pocketmine/block/IronOre.php @@ -45,7 +45,7 @@ class IronOre extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 3){ + if($item->isPickaxe() >= Tool::TIER_STONE){ return [ [Item::IRON_ORE, 0, 1], ]; diff --git a/src/pocketmine/block/Lapis.php b/src/pocketmine/block/Lapis.php index aa0b9212f..5cc8a2537 100644 --- a/src/pocketmine/block/Lapis.php +++ b/src/pocketmine/block/Lapis.php @@ -45,7 +45,7 @@ class Lapis extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 3){ + if($item->isPickaxe() >= Tool::TIER_STONE){ return [ [Item::LAPIS_BLOCK, 0, 1], ]; diff --git a/src/pocketmine/block/LapisOre.php b/src/pocketmine/block/LapisOre.php index 44d6e9eeb..68ca5626e 100644 --- a/src/pocketmine/block/LapisOre.php +++ b/src/pocketmine/block/LapisOre.php @@ -45,7 +45,7 @@ class LapisOre extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 3){ + if($item->isPickaxe() >= Tool::TIER_STONE){ return [ [Item::DYE, 4, mt_rand(4, 8)], ]; diff --git a/src/pocketmine/block/MossStone.php b/src/pocketmine/block/MossStone.php index 5700d5928..6476028f2 100644 --- a/src/pocketmine/block/MossStone.php +++ b/src/pocketmine/block/MossStone.php @@ -45,7 +45,7 @@ class MossStone extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::MOSS_STONE, $this->meta, 1], ]; diff --git a/src/pocketmine/block/NetherBrick.php b/src/pocketmine/block/NetherBrick.php index 937713b80..12400a516 100644 --- a/src/pocketmine/block/NetherBrick.php +++ b/src/pocketmine/block/NetherBrick.php @@ -45,7 +45,7 @@ class NetherBrick extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::NETHER_BRICKS, 0, 1], ]; diff --git a/src/pocketmine/block/NetherBrickFence.php b/src/pocketmine/block/NetherBrickFence.php index b42cdbd7f..62a182375 100644 --- a/src/pocketmine/block/NetherBrickFence.php +++ b/src/pocketmine/block/NetherBrickFence.php @@ -47,7 +47,6 @@ class NetherBrickFence extends Transparent { } public function getToolType(){ - //Different then the woodfences return Tool::TYPE_PICKAXE; } @@ -61,9 +60,9 @@ class NetherBrickFence extends Transparent { } public function getDrops(Item $item){ - if($item->isPickaxe() >= Tool::TYPE_WOODEN){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ - [Item::NETHER_BRICK_FENCE, $this->meta, 1], + [$this->id, $this->meta, 1], ]; }else{ return []; diff --git a/src/pocketmine/block/Netherrack.php b/src/pocketmine/block/Netherrack.php index 8d3d5135a..7496ad14d 100644 --- a/src/pocketmine/block/Netherrack.php +++ b/src/pocketmine/block/Netherrack.php @@ -45,7 +45,7 @@ class Netherrack extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::NETHERRACK, 0, 1], ]; diff --git a/src/pocketmine/block/Obsidian.php b/src/pocketmine/block/Obsidian.php index cc93e4379..f483c58b9 100644 --- a/src/pocketmine/block/Obsidian.php +++ b/src/pocketmine/block/Obsidian.php @@ -45,7 +45,7 @@ class Obsidian extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 5){ + if($item->isPickaxe() >= Tool::TIER_DIAMOND){ return [ [Item::OBSIDIAN, 0, 1], ]; diff --git a/src/pocketmine/block/Quartz.php b/src/pocketmine/block/Quartz.php index 5dacc3eb7..cbf0c432c 100644 --- a/src/pocketmine/block/Quartz.php +++ b/src/pocketmine/block/Quartz.php @@ -56,7 +56,7 @@ class Quartz extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::QUARTZ_BLOCK, $this->meta & 0x03, 1], ]; diff --git a/src/pocketmine/block/Redstone.php b/src/pocketmine/block/Redstone.php index c2707e016..41cd19d54 100644 --- a/src/pocketmine/block/Redstone.php +++ b/src/pocketmine/block/Redstone.php @@ -45,7 +45,7 @@ class Redstone extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::REDSTONE_BLOCK, 0, 1], ]; diff --git a/src/pocketmine/block/RedstoneOre.php b/src/pocketmine/block/RedstoneOre.php index 6b31c4090..2fb6df907 100644 --- a/src/pocketmine/block/RedstoneOre.php +++ b/src/pocketmine/block/RedstoneOre.php @@ -58,7 +58,7 @@ class RedstoneOre extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 2){ + if($item->isPickaxe() >= Tool::TIER_GOLD){ return [ [Item::REDSTONE_DUST, 0, mt_rand(4, 5)], ]; diff --git a/src/pocketmine/block/Sandstone.php b/src/pocketmine/block/Sandstone.php index eab79265e..60bca024a 100644 --- a/src/pocketmine/block/Sandstone.php +++ b/src/pocketmine/block/Sandstone.php @@ -55,7 +55,7 @@ class Sandstone extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::SANDSTONE, $this->meta & 0x03, 1], ]; diff --git a/src/pocketmine/block/Slab.php b/src/pocketmine/block/Slab.php index 9bb0e3792..0bf6ae950 100644 --- a/src/pocketmine/block/Slab.php +++ b/src/pocketmine/block/Slab.php @@ -133,7 +133,7 @@ class Slab extends Transparent{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [$this->id, $this->meta & 0x07, 1], ]; diff --git a/src/pocketmine/block/Stair.php b/src/pocketmine/block/Stair.php index bb02a76d1..7416b6fd6 100644 --- a/src/pocketmine/block/Stair.php +++ b/src/pocketmine/block/Stair.php @@ -143,7 +143,7 @@ abstract class Stair extends Transparent{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [$this->getId(), 0, 1], ]; diff --git a/src/pocketmine/block/Stone.php b/src/pocketmine/block/Stone.php index 3b9eadd12..055731d7c 100644 --- a/src/pocketmine/block/Stone.php +++ b/src/pocketmine/block/Stone.php @@ -37,7 +37,6 @@ class Stone extends Solid{ public function __construct($meta = 0){ $this->meta = $meta; - } public function getHardness(){ diff --git a/src/pocketmine/block/StoneBricks.php b/src/pocketmine/block/StoneBricks.php index 0553f49a6..461a39e4e 100644 --- a/src/pocketmine/block/StoneBricks.php +++ b/src/pocketmine/block/StoneBricks.php @@ -55,7 +55,7 @@ class StoneBricks extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::STONE_BRICKS, $this->meta & 0x03, 1], ]; diff --git a/src/pocketmine/block/Stonecutter.php b/src/pocketmine/block/Stonecutter.php index 3dc127c46..918011e3f 100644 --- a/src/pocketmine/block/Stonecutter.php +++ b/src/pocketmine/block/Stonecutter.php @@ -55,7 +55,7 @@ class Stonecutter extends Solid{ } public function getDrops(Item $item){ - if($item->isPickaxe() >= 1){ + if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ [Item::STONECUTTER, 0, 1], ];