Added block break tool type, fixed falling sand, fixed duplicated jungle leaves

src/pocketmine/block/Chest.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Compound;
@@ -52,6 +53,10 @@ class Chest extends Transparent{
 		return "Chest";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	protected function recalculateBoundingBox(){
 		return new AxisAlignedBB(
 			$this->x + 0.0625,

src/pocketmine/block/Clay.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Clay extends Solid{
 
@@ -35,6 +36,10 @@ class Clay extends Solid{
 		return 0.6;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	public function getName(){
 		return "Clay Block";
 	}

src/pocketmine/block/Coal.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Coal extends Solid{
 
@@ -35,6 +36,10 @@ class Coal extends Solid{
 		return 5;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Coal Block";
 	}

src/pocketmine/block/CoalOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class CoalOre extends Solid{
 
@@ -35,6 +36,10 @@ class CoalOre extends Solid{
 		return 3;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Coal Ore";
 	}

src/pocketmine/block/CobblestoneStairs.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class CobblestoneStairs extends Stair{
 
 	protected $id = self::COBBLESTONE_STAIRS;
@@ -34,6 +36,10 @@ class CobblestoneStairs extends Stair{
 		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Cobblestone Stairs";
 	}

src/pocketmine/block/Cobweb.php

@@ -23,6 +23,7 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Cobweb extends Flowable{
 
@@ -44,6 +45,10 @@ class Cobweb extends Flowable{
 		return 4;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SWORD;
+	}
+
 	public function onEntityCollide(Entity $entity){
 		$entity->resetFallDistance();
 	}

src/pocketmine/block/DarkOakWoodStairs.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class DarkOakWoodStairs extends Stair{
 
@@ -35,6 +36,10 @@ class DarkOakWoodStairs extends Stair{
 		return "Dark Oak Wood Stairs";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[$this->id, 0, 1],

src/pocketmine/block/Diamond.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Diamond extends Solid{
 
@@ -39,6 +40,10 @@ class Diamond extends Solid{
 		return "Diamond Block";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
 			return [

src/pocketmine/block/DiamondOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class DiamondOre extends Solid{
 
@@ -39,6 +40,10 @@ class DiamondOre extends Solid{
 		return "Diamond Ore";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
 			return [

src/pocketmine/block/DoubleSlab.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class DoubleSlab extends Solid{
 
@@ -35,6 +36,10 @@ class DoubleSlab extends Solid{
 		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		static $names = [
 			0 => "Stone",

src/pocketmine/block/DoubleWoodSlab.php

@@ -35,6 +35,10 @@ class DoubleWoodSlab extends Solid{
 		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getName(){
 		static $names = [
 			0 => "Oak",

src/pocketmine/block/Emerald.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Emerald extends Solid{
 
@@ -35,6 +36,10 @@ class Emerald extends Solid{
 		return 5;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Emerald Block";
 	}

src/pocketmine/block/EmeraldOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class EmeraldOre extends Solid{
 
@@ -35,6 +36,10 @@ class EmeraldOre extends Solid{
 		return "Emerald Ore";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
 		return 3;
 	}

src/pocketmine/block/EndStone.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class EndStone extends Solid{
 
@@ -35,6 +36,10 @@ class EndStone extends Solid{
 		return "End Stone";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
 		return 3;
 	}

src/pocketmine/block/Fallable.php

@@ -24,6 +24,7 @@ namespace pocketmine\block;
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\Byte;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Double;
@@ -42,7 +43,7 @@ abstract class Fallable extends Solid{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(0);
+			$down = $this->getSide(Vector3::SIDE_DOWN);
 			if($down->getId() === self::AIR or ($down instanceof Liquid)){
 				$fall = Entity::createEntity("FallingSand", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), new Compound("", [
 					"Pos" => new Enum("Pos", [

src/pocketmine/block/Farmland.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 
 class Farmland extends Solid{
@@ -40,6 +41,10 @@ class Farmland extends Solid{
 		return 0.6;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	protected function recalculateBoundingBox(){
 		return new AxisAlignedBB(
 			$this->x,

src/pocketmine/block/Fence.php

@@ -21,6 +21,7 @@
 
 namespace pocketmine\block;
 
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 
@@ -36,6 +37,10 @@ class Fence extends Transparent{
 		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 
 	public function getName(){
 		static $names = [

src/pocketmine/block/FenceGate.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
@@ -45,6 +46,10 @@ class FenceGate extends Transparent{
 		return true;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 
 	protected function recalculateBoundingBox(){
 

src/pocketmine/block/GlowingRedstoneOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 
 class GlowingRedstoneOre extends Solid{
@@ -40,6 +41,10 @@ class GlowingRedstoneOre extends Solid{
 		return "Glowing Redstone Ore";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getLightLevel(){
 		return 9;
 	}

src/pocketmine/block/Glowstone.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Glowstone extends Transparent{
 
@@ -39,6 +40,10 @@ class Glowstone extends Transparent{
 		return 0.3;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getLightLevel(){
 		return 15;
 	}

src/pocketmine/block/Gold.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Gold extends Solid{
 
@@ -39,6 +40,10 @@ class Gold extends Solid{
 		return 3;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
 			return [

src/pocketmine/block/GoldOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class GoldOre extends Solid{
 
@@ -39,6 +40,10 @@ class GoldOre extends Solid{
 		return 3;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
 			return [

src/pocketmine/block/GrassPath.php

@@ -23,6 +23,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\generator\object\TallGrass as TallGrassObject;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
@@ -43,6 +44,10 @@ class GrassPath extends Transparent{
 		return "Grass Path";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	protected function recalculateBoundingBox(){
 		return new AxisAlignedBB(
 			$this->x,

src/pocketmine/block/Gravel.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Gravel extends Fallable{
 
@@ -39,6 +40,10 @@ class Gravel extends Fallable{
 		return 0.6;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	public function getDrops(Item $item){
 		if(mt_rand(1, 10) === 1){
 			return [

src/pocketmine/block/HardenedClay.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class HardenedClay extends Solid{
 
@@ -35,6 +36,10 @@ class HardenedClay extends Solid{
 		return "Hardened Clay";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
 		return 1.25;
 	}

src/pocketmine/block/Ice.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Ice extends Transparent{
 
@@ -39,6 +40,10 @@ class Ice extends Transparent{
 		return 0.5;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function onBreak(Item $item){
 		$this->getLevel()->setBlock($this, new Water(), true);
 

src/pocketmine/block/Iron.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Iron extends Solid{
 
@@ -35,6 +36,10 @@ class Iron extends Solid{
 		return "Iron Block";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
 		return 5;
 	}

src/pocketmine/block/IronBars.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class IronBars extends Thin{
 
@@ -34,10 +35,15 @@ class IronBars extends Thin{
 	public function getName(){
 		return "Iron Bars";
 	}
+
 	public function getHardness(){
 		return 5;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
 			return [

src/pocketmine/block/IronDoor.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class IronDoor extends Door{
 
@@ -35,6 +36,10 @@ class IronDoor extends Door{
 		return "Iron Door Block";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
 		return 5;
 	}

src/pocketmine/block/IronOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class IronOre extends Solid{
 
@@ -35,6 +36,10 @@ class IronOre extends Solid{
 		return "Iron Ore";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
 		return 3;
 	}

src/pocketmine/block/JungleWoodStairs.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class JungleWoodStairs extends Stair{
 
@@ -35,6 +36,10 @@ class JungleWoodStairs extends Stair{
 		return "Jungle Wood Stairs";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[$this->id, 0, 1],

src/pocketmine/block/Ladder.php

@@ -23,6 +23,7 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
@@ -133,6 +134,10 @@ class Ladder extends Transparent{
 		return false;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[$this->id, 0, 1],

src/pocketmine/block/Lapis.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Lapis extends Solid{
 
@@ -35,6 +36,10 @@ class Lapis extends Solid{
 		return "Lapis Lazuli Block";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
 		return 3;
 	}

src/pocketmine/block/LapisOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class LapisOre extends Solid{
 
@@ -35,6 +36,10 @@ class LapisOre extends Solid{
 		return 3;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Lapis Lazuli Ore";
 	}

src/pocketmine/block/Leaves.php

@@ -23,6 +23,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\LeavesDecayEvent;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\Player;
 use pocketmine\Server;
@@ -45,6 +46,10 @@ class Leaves extends Transparent{
 		return 0.2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHEARS;
+	}
+
 	public function getName(){
 		static $names = [
 			self::OAK => "Oak Leaves",

src/pocketmine/block/LitPumpkin.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\Player;
 
 class LitPumpkin extends Solid{
@@ -36,6 +37,10 @@ class LitPumpkin extends Solid{
 		return 1;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getName(){
 		return "Jack o'Lantern";
 	}

src/pocketmine/block/Melon.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Melon extends Transparent{
 
@@ -39,6 +40,10 @@ class Melon extends Transparent{
 		return 1;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[Item::MELON_SLICE, 0, mt_rand(3, 7)],

src/pocketmine/block/MonsterSpawner.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class MonsterSpawner extends Solid{
 
@@ -35,6 +36,10 @@ class MonsterSpawner extends Solid{
 		return 5;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Monster Spawner";
 	}

src/pocketmine/block/MossStone.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class MossStone extends Solid{
 
@@ -39,6 +40,10 @@ class MossStone extends Solid{
 		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
 			return [

src/pocketmine/block/Mycelium.php

@@ -23,6 +23,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
@@ -39,6 +40,10 @@ class Mycelium extends Solid{
 		return "Mycelium";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	public function getHardness(){
 		return 0.6;
 	}

src/pocketmine/block/NetherBrick.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class NetherBrick extends Solid{
 
@@ -31,6 +32,10 @@ class NetherBrick extends Solid{
 
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Nether Bricks";
 	}

src/pocketmine/block/NetherBrickStairs.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class NetherBrickStairs extends Stair{
 
 	protected $id = self::NETHER_BRICKS_STAIRS;
@@ -34,6 +36,10 @@ class NetherBrickStairs extends Stair{
 		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function __construct($meta = 0){
 		$this->meta = $meta;
 	}

src/pocketmine/block/Netherrack.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Netherrack extends Solid{
 
@@ -39,6 +40,10 @@ class Netherrack extends Solid{
 		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
 			return [

src/pocketmine/block/Obsidian.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Obsidian extends Solid{
 
@@ -35,6 +36,10 @@ class Obsidian extends Solid{
 		return "Obsidian";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
 		return 50;
 	}

src/pocketmine/block/Planks.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class Planks extends Solid{
 	const OAK = 0;
 	const SPRUCE = 1;
@@ -40,6 +42,10 @@ class Planks extends Solid{
 		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getName(){
 		static $names = [
 			self::OAK => "Oak Wood Planks",

src/pocketmine/block/Podzol.php

@@ -21,6 +21,8 @@
 
 namespace pocketmine\block;
 
+use pocketmine\item\Tool;
+
 class Podzol extends Solid{
 
 	protected $id = self::PODZOL;
@@ -29,6 +31,10 @@ class Podzol extends Solid{
 
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	public function getName(){
 		return "Podzol";
 	}

src/pocketmine/block/Pumpkin.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\Player;
 
 class Pumpkin extends Solid{
@@ -36,6 +37,10 @@ class Pumpkin extends Solid{
 		return 1;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getName(){
 		return "Pumpkin";
 	}

src/pocketmine/block/Quartz.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Quartz extends Solid{
 
@@ -45,6 +46,10 @@ class Quartz extends Solid{
 		return $names[$this->meta & 0x03];
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
 			return [

src/pocketmine/block/QuartzStairs.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class QuartzStairs extends Stair{
 
 	protected $id = self::QUARTZ_STAIRS;
@@ -34,6 +36,10 @@ class QuartzStairs extends Stair{
 		return 0.8;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Quartz Stairs";
 	}

src/pocketmine/block/Redstone.php

@@ -22,8 +22,9 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
-class Redstone extends Transparent{
+class Redstone extends Solid{
 
 	protected $id = self::REDSTONE_BLOCK;
 
@@ -35,6 +36,10 @@ class Redstone extends Transparent{
 		return 5;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Redstone Block";
 	}

src/pocketmine/block/RedstoneOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 
 class RedstoneOre extends Solid{
@@ -50,6 +51,12 @@ class RedstoneOre extends Solid{
 		return false;
 	}
 
+
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 2){
 			return [

src/pocketmine/block/Sand.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class Sand extends Fallable{
 
 	protected $id = self::SAND;
@@ -34,6 +36,10 @@ class Sand extends Fallable{
 		return 0.5;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	public function getName(){
 		if($this->meta === 0x01){
 			return "Red Sand";

src/pocketmine/block/Sandstone.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Sandstone extends Solid{
 
@@ -45,6 +46,10 @@ class Sandstone extends Solid{
 		return $names[$this->meta & 0x03];
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
 			return [

src/pocketmine/block/SandstoneStairs.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class SandstoneStairs extends Stair{
 
 	protected $id = self::SANDSTONE_STAIRS;
@@ -34,6 +36,10 @@ class SandstoneStairs extends Stair{
 		return 0.8;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Sandstone Stairs";
 	}

src/pocketmine/block/SignPost.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\Player;
 
@@ -97,4 +98,8 @@ class SignPost extends Transparent{
 			[Item::SIGN, 0, 1],
 		];
 	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
 }

src/pocketmine/block/Slab.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
@@ -132,4 +133,10 @@ class Slab extends Transparent{
 			return [];
 		}
 	}
+
+
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
 }

src/pocketmine/block/Snow.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class Snow extends Solid{
 
 	protected $id = self::SNOW_BLOCK;
@@ -34,6 +36,10 @@ class Snow extends Solid{
 		return 0.2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	public function getName(){
 		return "Snow Block";
 	}

src/pocketmine/block/SnowLayer.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\Player;
 
@@ -45,6 +46,10 @@ class SnowLayer extends Flowable{
 		return 0.1;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);

src/pocketmine/block/SoulSand.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 
 class SoulSand extends Solid{
@@ -40,6 +41,10 @@ class SoulSand extends Solid{
 		return 0.5;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	protected function recalculateBoundingBox(){
 
 		return new AxisAlignedBB(

src/pocketmine/block/SpruceWoodStairs.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class SpruceWoodStairs extends Stair{
 
@@ -35,6 +36,10 @@ class SpruceWoodStairs extends Stair{
 		return "Spruce Wood Stairs";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[$this->id, 0, 1],

src/pocketmine/block/StainedClay.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class StainedClay extends Solid{
 
@@ -35,6 +36,10 @@ class StainedClay extends Solid{
 		return 1.25;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		static $names = [
 			0 => "White Stained Clay",

src/pocketmine/block/StoneBrickStairs.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class StoneBrickStairs extends Stair{
 
 	protected $id = self::STONE_BRICK_STAIRS;
@@ -30,6 +32,10 @@ class StoneBrickStairs extends Stair{
 		$this->meta = $meta;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
 		return 1.5;
 	}

src/pocketmine/block/StoneBricks.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class StoneBricks extends Solid{
 
@@ -35,6 +36,10 @@ class StoneBricks extends Solid{
 		return 1.5;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		static $names = [
 			0 => "Stone Bricks",

src/pocketmine/block/StoneWall.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 
@@ -37,6 +38,10 @@ class StoneWall extends Transparent{
 		return false;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
 		return 2;
 	}

src/pocketmine/block/Stonecutter.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\Player;
 
 //TODO: check orientation
@@ -37,6 +38,10 @@ class Stonecutter extends Solid{
 		return "Stonecutter";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function canBeActivated(){
 		return true;
 	}

src/pocketmine/block/Trapdoor.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
@@ -148,4 +149,8 @@ class Trapdoor extends Transparent{
 
 		return true;
 	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
 }

src/pocketmine/block/Vine.php

@@ -163,4 +163,8 @@ class Vine extends Transparent{
 			return [];
 		}
 	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
 }

src/pocketmine/block/Wood.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\Player;
 
 class Wood extends Solid{
@@ -73,4 +74,8 @@ class Wood extends Solid{
 			[$this->id, $this->meta & 0x03, 1],
 		];
 	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
 }

src/pocketmine/block/WoodDoor.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class WoodDoor extends Door{
 
@@ -43,6 +44,10 @@ class WoodDoor extends Door{
 		return 3;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[Item::WOODEN_DOOR, 0, 1],

src/pocketmine/block/WoodSlab.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
@@ -122,6 +123,10 @@ class WoodSlab extends Transparent{
 		return true;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[$this->id, $this->meta & 0x07, 1],

src/pocketmine/block/WoodStairs.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class WoodStairs extends Stair{
 
@@ -35,6 +36,10 @@ class WoodStairs extends Stair{
 		return "Wood Stairs";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[$this->id, 0, 1],

src/pocketmine/block/Wool.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class Wool extends Solid{
 
 	protected $id = self::WOOL;
@@ -34,6 +36,10 @@ class Wool extends Solid{
 		return 0.8;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHEARS;
+	}
+
 	public function getName(){
 		static $names = [
 			0 => "White Wool",

src/pocketmine/block/Workbench.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\Player;
 
 //TODO: check orientation
@@ -45,6 +46,10 @@ class Workbench extends Solid{
 		return "Crafting Table";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function onActivate(Item $item, Player $player = null){
 		if($player instanceof Player){
 			$player->craftingType = 1;

src/pocketmine/entity/FallingSand.php

@@ -95,12 +95,13 @@ class FallingSand extends Entity{
 		if($tickDiff <= 0 and !$this->justCreated){
 			return true;
 		}
+
 		$this->lastUpdate = $currentTick;
 
 		$hasUpdate = $this->entityBaseTick($tickDiff);
 
 		if($this->isAlive()){
-			$pos = (new Vector3($this->x - 0.5, $this->y, $this->z - 0.5))->floor();
+			$pos = (new Vector3($this->x - 0.5, $this->y, $this->z - 0.5))->round();
 
 			if($this->ticksLived === 1){
 				$block = $this->level->getBlock($pos);

src/pocketmine/item/Item.php

@@ -686,7 +686,6 @@ class Item{
 		self::addCreativeItem(Item::get(Item::LEAVES, 1));
 		self::addCreativeItem(Item::get(Item::LEAVES, 2));
 		self::addCreativeItem(Item::get(Item::LEAVES, 3));
-		self::addCreativeItem(Item::get(Item::LEAVES, 3));
 		self::addCreativeItem(Item::get(Item::LEAVES2, 0));
 		self::addCreativeItem(Item::get(Item::LEAVES2, 1));
 		self::addCreativeItem(Item::get(Item::CAKE, 0));