Added Block->getVariantBitmask(0 to cut down on getDrops() boilerplate, fixed several blocks incorrectly retaining meta when broken

src/pocketmine/block/ActivatorRail.php

@@ -30,4 +30,6 @@ class ActivatorRail extends Rail{
 	public function getName() : string{
 		return "Activator Rail";
 	}
+
+	//TODO
 }

src/pocketmine/block/Block.php

@@ -398,8 +398,9 @@ class Block extends Position implements BlockIds, Metadatable{
 		return $block;
 	}
 
-
+	/** @var int */
 	protected $id;
+	/** @var int */
 	protected $meta = 0;
 	/** @var string */
 	protected $fallbackName;
@@ -460,6 +461,19 @@ class Block extends Position implements BlockIds, Metadatable{
 		$this->meta = $meta & 0x0f;
 	}
 
+	/**
+	 * Bitmask to use to remove superfluous information from block meta when getting its item form or name.
+	 * This defaults to -1 (don't remove any data). Used to remove rotation data and bitflags from block drops.
+	 *
+	 * If your block should not have any meta value when it's dropped as an item, override this to return 0 in
+	 * descendent classes.
+	 *
+	 * @return int
+	 */
+	public function getVariantBitmask() : int{
+		return -1;
+	}
+
 	/**
 	 * Places the Block, using block space and block target, and side. Returns if the block has been placed.
 	 *
@@ -658,7 +672,7 @@ class Block extends Position implements BlockIds, Metadatable{
 	 */
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get($this->getItemId(), $this->getDamage(), 1),
+			Item::get($this->getItemId(), $this->getDamage() & $this->getVariantBitmask(), 1),
 		];
 	}
 

src/pocketmine/block/BrewingStand.php

@@ -44,4 +44,10 @@ class BrewingStand extends Transparent{
 	public function getToolType() : int{
 		return Tool::TYPE_PICKAXE;
 	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+
+	//TODO
 }

src/pocketmine/block/BurningFurnace.php

@@ -118,11 +118,13 @@ class BurningFurnace extends Solid{
 		return true;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return [
-				Item::get($this->getItemId(), 0, 1)
-			];
+			return parent::getDrops($item);
 		}
 
 		return [];

src/pocketmine/block/Cactus.php

@@ -125,9 +125,7 @@ class Cactus extends Transparent{
 		return false;
 	}
 
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getItemId(), 0, 1)
-		];
+	public function getVariantBitmask() : int{
+		return 0;
 	}
 }

src/pocketmine/block/Chest.php

@@ -169,10 +169,8 @@ class Chest extends Transparent{
 		return true;
 	}
 
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getItemId(), 0, 1)
-		];
+	public function getVariantBitmask() : int{
+		return 0;
 	}
 
 	public function getFuelTime() : int{

src/pocketmine/block/CocoaBlock.php

@@ -34,4 +34,6 @@ class CocoaBlock extends Solid{
 	public function getName() : string{
 		return "Cocoa Block";
 	}
+
+	//TODO
 }

src/pocketmine/block/DaylightSensor.php

@@ -42,4 +42,6 @@ class DaylightSensor extends Transparent{
 	public function getFuelTime() : int{
 		return 300;
 	}
+
+	//TODO
 }

src/pocketmine/block/DetectorRail.php

@@ -30,4 +30,6 @@ class DetectorRail extends Rail{
 	public function getName() : string{
 		return "Detector Rail";
 	}
+
+	//TODO
 }

src/pocketmine/block/Door.php

@@ -282,4 +282,8 @@ abstract class Door extends Transparent{
 
 		return true;
 	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
 }

src/pocketmine/block/DoublePlant.php

@@ -104,6 +104,10 @@ class DoublePlant extends Flowable{
 		return false;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0x07;
+	}
+
 	public function getDrops(Item $item) : array{
 		if(!$item->isShears() and ($this->meta === 2 or $this->meta === 3)){ //grass or fern
 			if(mt_rand(0, 24) === 0){
@@ -115,8 +119,6 @@ class DoublePlant extends Flowable{
 			return [];
 		}
 
-		return [
-			Item::get($this->getItemId(), $this->getDamage() & 0x07, 1)
-		];
+		return parent::getDrops($item);
 	}
 }

src/pocketmine/block/EnchantingTable.php

@@ -92,9 +92,7 @@ class EnchantingTable extends Transparent{
 
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return [
-				Item::get($this->getItemId(), 0, 1)
-			];
+			return parent::getDrops($item);
 		}
 
 		return [];

src/pocketmine/block/EndRod.php

@@ -97,10 +97,7 @@ class EndRod extends Flowable{
 		return null;
 	}
 
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getId(), 0, 1)
-		];
+	public function getVariantBitmask() : int{
+		return 0;
 	}
-
 }

src/pocketmine/block/FenceGate.php

@@ -75,10 +75,8 @@ class FenceGate extends Transparent{
 		return true;
 	}
 
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getItemId(), 0, 1)
-		];
+	public function getVariantBitmask() : int{
+		return 0;
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{

src/pocketmine/block/GlazedTerracotta.php

@@ -52,11 +52,13 @@ class GlazedTerracotta extends Solid{
 		return $this->getLevel()->setBlock($block, $this, true, true);
 	}
 
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return [
-				Item::get($this->getItemId(), 0, 1)
-			];
+			return parent::getDrops($item);
 		}
 
 		return [];

src/pocketmine/block/Gravel.php

@@ -53,9 +53,7 @@ class Gravel extends Fallable{
 			];
 		}
 
-		return [
-			Item::get(Item::GRAVEL, 0, 1)
-		];
+		return parent::getDrops($item);
 	}
 
 }

src/pocketmine/block/HayBale.php

@@ -58,10 +58,7 @@ class HayBale extends Solid{
 		return true;
 	}
 
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getItemId(), 0, 1)
-		];
+	public function getVariantBitmask() : int{
+		return 0x03;
 	}
-
 }

src/pocketmine/block/IronBars.php

@@ -46,11 +46,13 @@ class IronBars extends Thin{
 		return Tool::TYPE_PICKAXE;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return [
-				Item::get($this->getItemId(), 0, 1)
-			];
+			return parent::getDrops($item);
 		}
 
 		return [];

src/pocketmine/block/ItemFrame.php

@@ -139,10 +139,7 @@ class ItemFrame extends Flowable{
 
 	}
 
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getItemId(), 0, 1)
-		];
+	public function getVariantBitmask() : int{
+		return 0;
 	}
-
 }

src/pocketmine/block/Ladder.php

@@ -149,9 +149,7 @@ class Ladder extends Transparent{
 		return Tool::TYPE_AXE;
 	}
 
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getItemId(), 0, 1)
-		];
+	public function getVariantBitmask() : int{
+		return 0;
 	}
 }

src/pocketmine/block/Prismarine.php

@@ -55,11 +55,13 @@ class Prismarine extends Solid{
 		return Tool::TYPE_PICKAXE;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0x03;
+	}
+
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return [
-				Item::get($this->getItemId(), $this->getDamage() & 0x03, 1)
-			];
+			return parent::getDrops($item);
 		}
 
 		return [];

src/pocketmine/block/Pumpkin.php

@@ -56,4 +56,7 @@ class Pumpkin extends Solid{
 		return true;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0;
+	}
 }

src/pocketmine/block/Quartz.php

@@ -57,11 +57,13 @@ class Quartz extends Solid{
 		return Tool::TYPE_PICKAXE;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0x03;
+	}
+
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return [
-				Item::get($this->getItemId(), $this->getDamage() & 0x03, 1)
-			];
+			return parent::getDrops($item);
 		}
 
 		return [];

src/pocketmine/block/Rail.php

@@ -75,4 +75,8 @@ class Rail extends Flowable{
 
 		return false;
 	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
 }

src/pocketmine/block/Sandstone.php

@@ -55,11 +55,13 @@ class Sandstone extends Solid{
 		return Tool::TYPE_PICKAXE;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0x03;
+	}
+
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return [
-				Item::get($this->getItemId(), $this->getDamage() & 0x03, 1)
-			];
+			return parent::getDrops($item);
 		}
 
 		return [];

src/pocketmine/block/SignPost.php

@@ -114,4 +114,8 @@ class SignPost extends Transparent{
 	public function getToolType() : int{
 		return Tool::TYPE_AXE;
 	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
 }

src/pocketmine/block/Stair.php

@@ -145,11 +145,13 @@ abstract class Stair extends Transparent{
 		return true;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return [
-				Item::get($this->getItemId(), 0, 1)
-			];
+			return parent::getDrops($item);
 		}
 
 		return [];

src/pocketmine/block/StoneBricks.php

@@ -58,9 +58,7 @@ class StoneBricks extends Solid{
 
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
-			return [
-				Item::get($this->getItemId(), $this->getDamage() & 0x03, 1)
-			];
+			return parent::getDrops($item);
 		}
 
 		return [];

src/pocketmine/block/StoneButton.php

@@ -38,4 +38,8 @@ class StoneButton extends Flowable{
 	public function getHardness() : float{
 		return 0.5;
 	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
 }

src/pocketmine/block/StonePressurePlate.php

@@ -42,4 +42,8 @@ class StonePressurePlate extends Transparent{
 	public function getHardness() : float{
 		return 0.5;
 	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
 }

src/pocketmine/block/Sugarcane.php

@@ -122,4 +122,8 @@ class Sugarcane extends Flowable{
 
 		return false;
 	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
 }

src/pocketmine/block/Torch.php

@@ -93,9 +93,7 @@ class Torch extends Flowable{
 		return false;
 	}
 
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getItemId(), 0, 1)
-		];
+	public function getVariantBitmask() : int{
+		return 0;
 	}
 }

src/pocketmine/block/Trapdoor.php

@@ -140,10 +140,8 @@ class Trapdoor extends Transparent{
 		return true;
 	}
 
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getItemId(), 0, 1)
-		];
+	public function getVariantBitmask() : int{
+		return 0;
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{

src/pocketmine/block/TripwireHook.php

@@ -34,4 +34,10 @@ class TripwireHook extends Flowable{
 	public function getName() : string{
 		return "Tripwire Hook";
 	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+
+	//TODO
 }

src/pocketmine/block/Vine.php

@@ -174,11 +174,13 @@ class Vine extends Transparent{
 		return false;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+
 	public function getDrops(Item $item) : array{
 		if($item->isShears()){
-			return [
-				Item::get($this->getItemId(), 0, 1)
-			];
+			return parent::getDrops($item);
 		}
 
 		return [];

src/pocketmine/block/WaterLily.php

@@ -80,9 +80,7 @@ class WaterLily extends Flowable{
 		return false;
 	}
 
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getItemId(), 0, 1)
-		];
+	public function getVariantBitmask() : int{
+		return 0;
 	}
 }

src/pocketmine/block/WeightedPressurePlateLight.php

@@ -42,4 +42,8 @@ class WeightedPressurePlateLight extends Transparent{
 	public function getHardness() : float{
 		return 0.5;
 	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
 }

src/pocketmine/block/Wood.php

@@ -69,10 +69,8 @@ class Wood extends Solid{
 		return true;
 	}
 
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getItemId(), $this->getDamage() & 0x03, 1)
-		];
+	public function getVariantBitmask() : int{
+		return 0x03;
 	}
 
 	public function getToolType() : int{

src/pocketmine/block/WoodenDoor.php

@@ -35,10 +35,4 @@ class WoodenDoor extends Door{
 	public function getToolType() : int{
 		return Tool::TYPE_AXE;
 	}
-
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getItemId(), 0, 1)
-		];
-	}
 }

src/pocketmine/block/WoodenSlab.php

@@ -129,10 +129,8 @@ class WoodenSlab extends Transparent{
 		return Tool::TYPE_AXE;
 	}
 
-	public function getDrops(Item $item) : array{
-		return [
-			Item::get($this->getItemId(), $this->getDamage() & 0x07, 1)
-		];
+	public function getVariantBitmask() : int{
+		return 0x07;
 	}
 
 	public function getFuelTime() : int{

src/pocketmine/block/WoodenStairs.php

@@ -40,9 +40,14 @@ class WoodenStairs extends Stair{
 		return Tool::TYPE_AXE;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+
 	public function getDrops(Item $item) : array{
+		//TODO: Hierarchy problem (base class is for stone stairs)
 		return [
-			Item::get($this->getItemId(), 0, 1)
+			Item::get($this->getItemId(), $this->getDamage() & $this->getVariantBitmask(), 1)
 		];
 	}
 }