diff --git a/src/config.php b/src/config.php index fa5f0559d..6db74a279 100644 --- a/src/config.php +++ b/src/config.php @@ -43,7 +43,7 @@ ini_set("memory_limit", "256M"); //Default define("LOG", true); define("MAGIC", "\x00\xff\xff\x00\xfe\xfe\xfe\xfe\xfd\xfd\xfd\xfd\x12\x34\x56\x78"); define("TEST_MD5", "ffe889db5932db1e3371d48773590e59"); -define("MAJOR_VERSION", "Alpha_1.2dev"); +define("MAJOR_VERSION", "Alpha_1.2"); define("CURRENT_STRUCTURE", 5); define("CURRENT_PROTOCOL", 9); define("CURRENT_MINECRAFT_VERSION", "v0.6.1 alpha"); diff --git a/src/material/block/solid/BurningFurnace.php b/src/material/block/solid/BurningFurnace.php index d14ea676c..7be7596e9 100644 --- a/src/material/block/solid/BurningFurnace.php +++ b/src/material/block/solid/BurningFurnace.php @@ -25,16 +25,33 @@ the Free Software Foundation, either version 3 of the License, or */ -/***REM_START***/ -require_once("Furnace.php"); -/***REM_END***/ -class BurningFurnaceBlock extends FurnaceBlock{ +class BurningFurnaceBlock extends SolidBlock{ public function __construct($meta = 0){ - parent::__construct($meta); - $this->id = BURNING_FURNACE; - $this->name = "Burning Furnace"; + parent::__construct(BURNING_FURNACE, $meta, "Burning Furnace"); $this->isActivable = true; } - + + public function place(BlockAPI $level, Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ + if($block->inWorld === true){ + $faces = array( + 0 => 4, + 1 => 2, + 2 => 5, + 3 => 3, + ); + $level->setBlock($block, $this->id, $faces[$player->entity->getDirection()]); + return true; + } + return false; + } + public function getDrops(Item $item, Player $player){ + if($item->isPickaxe() >= 1){ + return array( + array(FURNACE, 0, 1), + ); + }else{ + return array(); + } + } } \ No newline at end of file diff --git a/src/material/block/solid/Furnace.php b/src/material/block/solid/Furnace.php index e82385025..85e5b7726 100644 --- a/src/material/block/solid/Furnace.php +++ b/src/material/block/solid/Furnace.php @@ -25,33 +25,12 @@ the Free Software Foundation, either version 3 of the License, or */ - -class FurnaceBlock extends SolidBlock{ +class FurnaceBlock extends BurningFurnaceBlock{ public function __construct($meta = 0){ - parent::__construct(FURNACE, $meta, "Furnace"); + parent::__construct($meta); + $this->id = FURNACE; + $this->name = "Furnace"; $this->isActivable = true; } - - public function place(BlockAPI $level, Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ - if($block->inWorld === true){ - $faces = array( - 0 => 4, - 1 => 2, - 2 => 5, - 3 => 3, - ); - $level->setBlock($block, $this->id, $faces[$player->entity->getDirection()]); - return true; - } - return false; - } - public function getDrops(Item $item, Player $player){ - if($item->isPickaxe() >= 1){ - return array( - array(FURNACE, 0, 1), - ); - }else{ - return array(); - } - } + } \ No newline at end of file