From 5f8dc5829c4edc2173eb1713a9aeec18c57d3e8f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 17 Sep 2016 14:46:34 +0100 Subject: [PATCH] Better inheritance for wooden stairs --- src/pocketmine/block/AcaciaWoodStairs.php | 27 +--------------------- src/pocketmine/block/BirchWoodStairs.php | 27 +--------------------- src/pocketmine/block/DarkOakWoodStairs.php | 19 +-------------- src/pocketmine/block/JungleWoodStairs.php | 19 +-------------- src/pocketmine/block/SpruceWoodStairs.php | 19 +-------------- src/pocketmine/block/WoodStairs.php | 12 ++++++---- 6 files changed, 13 insertions(+), 110 deletions(-) diff --git a/src/pocketmine/block/AcaciaWoodStairs.php b/src/pocketmine/block/AcaciaWoodStairs.php index 1efa40a94..69ede1cac 100644 --- a/src/pocketmine/block/AcaciaWoodStairs.php +++ b/src/pocketmine/block/AcaciaWoodStairs.php @@ -21,36 +21,11 @@ namespace pocketmine\block; -use pocketmine\item\Item; -use pocketmine\item\Tool; - -class AcaciaWoodStairs extends Stair{ +class AcaciaWoodStairs extends WoodStairs{ protected $id = self::ACACIA_WOOD_STAIRS; - public function __construct($meta = 0){ - $this->meta = $meta; - } - public function getName(){ return "Acacia Wood Stairs"; } - - public function getDrops(Item $item){ - return [ - [$this->id, 0, 1], - ]; - } - - public function getHardness(){ - return 2; - } - - public function getResistance(){ - return 15; - } - - public function getToolType(){ - return Tool::TYPE_AXE; - } } \ No newline at end of file diff --git a/src/pocketmine/block/BirchWoodStairs.php b/src/pocketmine/block/BirchWoodStairs.php index 7dd5571ff..a7d8dfa3f 100644 --- a/src/pocketmine/block/BirchWoodStairs.php +++ b/src/pocketmine/block/BirchWoodStairs.php @@ -21,36 +21,11 @@ namespace pocketmine\block; -use pocketmine\item\Item; -use pocketmine\item\Tool; - -class BirchWoodStairs extends Stair{ +class BirchWoodStairs extends WoodStairs{ protected $id = self::BIRCH_WOOD_STAIRS; - public function __construct($meta = 0){ - $this->meta = $meta; - } - public function getName(){ return "Birch Wood Stairs"; } - - public function getDrops(Item $item){ - return [ - [$this->id, 0, 1], - ]; - } - - public function getHardness(){ - return 2; - } - - public function getResistance(){ - return 15; - } - - public function getToolType(){ - return Tool::TYPE_AXE; - } } \ No newline at end of file diff --git a/src/pocketmine/block/DarkOakWoodStairs.php b/src/pocketmine/block/DarkOakWoodStairs.php index 1ed510416..410fb8ade 100644 --- a/src/pocketmine/block/DarkOakWoodStairs.php +++ b/src/pocketmine/block/DarkOakWoodStairs.php @@ -21,28 +21,11 @@ namespace pocketmine\block; -use pocketmine\item\Item; -use pocketmine\item\Tool; - -class DarkOakWoodStairs extends Stair{ +class DarkOakWoodStairs extends WoodStairs{ protected $id = self::DARK_OAK_WOOD_STAIRS; - public function __construct($meta = 0){ - $this->meta = $meta; - } - public function getName(){ return "Dark Oak Wood Stairs"; } - - public function getToolType(){ - return Tool::TYPE_AXE; - } - - public function getDrops(Item $item){ - return [ - [$this->id, 0, 1], - ]; - } } \ No newline at end of file diff --git a/src/pocketmine/block/JungleWoodStairs.php b/src/pocketmine/block/JungleWoodStairs.php index 1062bb4e5..a59b0553c 100644 --- a/src/pocketmine/block/JungleWoodStairs.php +++ b/src/pocketmine/block/JungleWoodStairs.php @@ -21,28 +21,11 @@ namespace pocketmine\block; -use pocketmine\item\Item; -use pocketmine\item\Tool; - -class JungleWoodStairs extends Stair{ +class JungleWoodStairs extends WoodStairs{ protected $id = self::JUNGLE_WOOD_STAIRS; - public function __construct($meta = 0){ - $this->meta = $meta; - } - public function getName(){ return "Jungle Wood Stairs"; } - - public function getToolType(){ - return Tool::TYPE_AXE; - } - - public function getDrops(Item $item){ - return [ - [$this->id, 0, 1], - ]; - } } \ No newline at end of file diff --git a/src/pocketmine/block/SpruceWoodStairs.php b/src/pocketmine/block/SpruceWoodStairs.php index 6c97a36fe..bedc114cc 100644 --- a/src/pocketmine/block/SpruceWoodStairs.php +++ b/src/pocketmine/block/SpruceWoodStairs.php @@ -21,28 +21,11 @@ namespace pocketmine\block; -use pocketmine\item\Item; -use pocketmine\item\Tool; - -class SpruceWoodStairs extends Stair{ +class SpruceWoodStairs extends WoodStairs{ protected $id = self::SPRUCE_WOOD_STAIRS; - public function __construct($meta = 0){ - $this->meta = $meta; - } - public function getName(){ return "Spruce Wood Stairs"; } - - public function getToolType(){ - return Tool::TYPE_AXE; - } - - public function getDrops(Item $item){ - return [ - [$this->id, 0, 1], - ]; - } } \ No newline at end of file diff --git a/src/pocketmine/block/WoodStairs.php b/src/pocketmine/block/WoodStairs.php index 450a7fc1d..22f85b6ed 100644 --- a/src/pocketmine/block/WoodStairs.php +++ b/src/pocketmine/block/WoodStairs.php @@ -36,6 +36,14 @@ class WoodStairs extends Stair{ return "Wood Stairs"; } + public function getHardness(){ + return 2; + } + + public function getResistance(){ + return 15; + } + public function getToolType(){ return Tool::TYPE_AXE; } @@ -45,8 +53,4 @@ class WoodStairs extends Stair{ [$this->id, 0, 1], ]; } - - public function getHardness(){ - return 2; - } } \ No newline at end of file