From 1bd9cbd4d3600df6d01443f7df4a3c83b2017c13 Mon Sep 17 00:00:00 2001 From: PEMapModder Date: Sat, 13 Dec 2014 20:42:23 +0800 Subject: [PATCH 1/2] Update documentation of PluginBase::getCommand() for IDEs' auto completion --- src/pocketmine/plugin/PluginBase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/plugin/PluginBase.php b/src/pocketmine/plugin/PluginBase.php index 2ac0dab00..368d24139 100644 --- a/src/pocketmine/plugin/PluginBase.php +++ b/src/pocketmine/plugin/PluginBase.php @@ -135,7 +135,7 @@ abstract class PluginBase implements Plugin{ /** * @param string $name * - * @return PluginIdentifiableCommand + * @return Command|PluginIdentifiableCommand */ public function getCommand($name){ $command = $this->getServer()->getPluginCommand($name); @@ -290,4 +290,4 @@ abstract class PluginBase implements Plugin{ return $this->loader; } -} \ No newline at end of file +} From 1b50879823058e3bc3418d2632d1f978e4efe3fd Mon Sep 17 00:00:00 2001 From: Intyre Date: Sat, 13 Dec 2014 17:10:17 +0100 Subject: [PATCH 2/2] Snow layer recipe added: Fix for #2400 --- src/pocketmine/inventory/CraftingManager.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/inventory/CraftingManager.php b/src/pocketmine/inventory/CraftingManager.php index d5e039188..a71328442 100644 --- a/src/pocketmine/inventory/CraftingManager.php +++ b/src/pocketmine/inventory/CraftingManager.php @@ -56,6 +56,7 @@ class CraftingManager{ $this->registerRecipe((new ShapelessRecipe(Item::get(Item::GLOWSTONE_BLOCK, 0, 1)))->addIngredient(Item::get(Item::GLOWSTONE_DUST, 0, 4))); $this->registerRecipe((new ShapelessRecipe(Item::get(Item::LIT_PUMPKIN, 0, 1)))->addIngredient(Item::get(Item::PUMPKIN, 0, 1))->addIngredient(Item::get(Item::TORCH, 0, 1))); $this->registerRecipe((new ShapelessRecipe(Item::get(Item::SNOW_BLOCK, 0, 1)))->addIngredient(Item::get(Item::SNOWBALL, 0, 4))); + $this->registerRecipe((new ShapelessRecipe(Item::get(Item::SNOW_LAYER, 0, 6)))->addIngredient(Item::get(Item::SNOW_BLOCK, 0, 3))); $this->registerRecipe((new ShapelessRecipe(Item::get(Item::STICK, 0, 4)))->addIngredient(Item::get(Item::WOODEN_PLANK, null, 2))); $this->registerRecipe((new ShapelessRecipe(Item::get(Item::STONECUTTER, 0, 1)))->addIngredient(Item::get(Item::COBBLESTONE, 0, 4))); $this->registerRecipe((new ShapelessRecipe(Item::get(Item::WOODEN_PLANK, Planks::OAK, 4)))->addIngredient(Item::get(Item::WOOD, Wood::OAK, 1))); @@ -457,4 +458,4 @@ class CraftingManager{ } } -} +} \ No newline at end of file