Fix some non-properly-implemented blocks killing people and bad inheritances

src/pocketmine/block/ActivatorRail.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class ActivatorRail extends Solid{
+class ActivatorRail extends Rail{
 
 	protected $id = self::ACTIVATOR_RAIL;
 

src/pocketmine/block/DaylightSensor.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class DaylightSensor extends Solid{
+class DaylightSensor extends Transparent{
 
 	protected $id = self::DAYLIGHT_SENSOR;
 

src/pocketmine/block/DetectorRail.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class DetectorRail extends Solid{
+class DetectorRail extends Rail{
 
 	protected $id = self::DETECTOR_RAIL;
 

src/pocketmine/block/Lever.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class Lever extends Solid{
+class Lever extends Flowable{
 
 	protected $id = self::LEVER;
 

src/pocketmine/block/LitPumpkin.php

@@ -25,7 +25,7 @@ use pocketmine\item\Item;
 use pocketmine\item\Tool;
 use pocketmine\Player;
 
-class LitPumpkin extends Solid{
+class LitPumpkin extends Pumpkin{
 
 	protected $id = self::LIT_PUMPKIN;
 
@@ -33,28 +33,7 @@ class LitPumpkin extends Solid{
 		return 15;
 	}
 
-	public function getHardness(){
-		return 1;
-	}
-
-	public function getToolType(){
-		return Tool::TYPE_AXE;
-	}
-
 	public function getName(){
 		return "Jack o'Lantern";
 	}
-
-	public function __construct($meta = 0){
-		$this->meta = $meta;
-	}
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		if($player instanceof Player){
-			$this->meta = ((int) $player->getDirection() + 5) % 4;
-		}
-		$this->getLevel()->setBlock($block, $this, true, true);
-
-		return true;
-	}
 }

src/pocketmine/block/LitRedstoneLamp.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class LitRedstoneLamp extends Solid{
+class LitRedstoneLamp extends RedstoneLamp{
 
 	protected $id = self::LIT_REDSTONE_LAMP;
 

src/pocketmine/block/LitRedstoneTorch.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class LitRedstoneTorch extends Solid{
+class LitRedstoneTorch extends RedstoneTorch{
 
 	protected $id = self::REDSTONE_TORCH;
 

src/pocketmine/block/PoweredRail.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class PoweredRail extends Solid{
+class PoweredRail extends Rail{
 	protected $id = self::POWERED_RAIL;
 
 	public function __construct($meta = 0){

src/pocketmine/block/Pumpkin.php

@@ -29,8 +29,8 @@ class Pumpkin extends Solid{
 
 	protected $id = self::PUMPKIN;
 
-	public function __construct(){
+	public function __construct($meta = 0){
-
+		$this->meta = $meta;
 	}
 
 	public function getHardness(){
@@ -47,7 +47,7 @@ class Pumpkin extends Solid{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		if($player instanceof Player){
-			$this->meta = ((int) $player->getDirection() + 5) % 4;
+			$this->meta = ((int) $player->getDirection() + 1) % 4;
 		}
 		$this->getLevel()->setBlock($block, $this, true, true);
 

src/pocketmine/block/Rail.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class Rail extends Solid{
+class Rail extends Flowable{
 
 	protected $id = self::RAIL;
 

src/pocketmine/block/RedstoneTorch.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class RedstoneTorch extends Solid{
+class RedstoneTorch extends Torch{
 
 	protected $id = self::REDSTONE_TORCH;
 

src/pocketmine/block/StoneButton.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class StoneButton extends Solid{
+class StoneButton extends Flowable{
 
 	protected $id = self::STONE_BUTTON;
 

src/pocketmine/block/StonePressurePlate.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class StonePressurePlate extends Solid{
+class StonePressurePlate extends Transparent{
 
 	protected $id = self::STONE_PRESSURE_PLATE;
 
@@ -32,4 +32,8 @@ class StonePressurePlate extends Solid{
 	public function getName(){
 		return "Stone Pressure Plate";
 	}
+
+	public function isSolid(){
+		return false;
+	}
 }

src/pocketmine/block/Tripwire.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class Tripwire extends Solid{
+class Tripwire extends Flowable{
 
 	protected $id = self::TRIPWIRE;
 

src/pocketmine/block/TripwireHook.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class TripwireHook extends Solid{
+class TripwireHook extends Flowable{
 
 	protected $id = self::TRIPWIRE_HOOK;
 

src/pocketmine/block/WeightedPressurePlateHeavy.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class WeightedPressurePlateHeavy extends Solid{
+class WeightedPressurePlateHeavy extends WeightedPressurePlateLight{
 
 	protected $id = self::WEIGHTED_PRESSURE_PLATE_HEAVY;
 

src/pocketmine/block/WeightedPressurePlateLight.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class WeightedPressurePlateLight extends Solid{
+class WeightedPressurePlateLight extends Transparent{
 
 	protected $id = self::WEIGHTED_PRESSURE_PLATE_LIGHT;
 
@@ -32,4 +32,8 @@ class WeightedPressurePlateLight extends Solid{
 	public function getName(){
 		return "Weighted Pressure Plate Light";
 	}
+
+	public function isSolid(){
+		return false;
+	}
 }

src/pocketmine/block/WoodenButton.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class WoodenButton extends Solid{
+class WoodenButton extends StoneButton{
 
 	protected $id = self::WOODEN_BUTTON;
 

src/pocketmine/block/WoodenPressurePlate.php

@@ -21,7 +21,7 @@
 
 namespace pocketmine\block;
 
-class WoodenPressurePlate extends Solid{
+class WoodenPressurePlate extends StonePressurePlate{
 
 	protected $id = self::WOODEN_PRESSURE_PLATE;