mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-23 00:55:57 +00:00
Code Issues Projects Releases Wiki Activity

Fixed handling of recipes that require a crafting table

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-09-20 09:43:49 +01:00
parent fd33a65e3b
commit f0755d1659
6 changed files with 11 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/Player.php
View File

@ -71,8 +71,6 @@ use pocketmine\event\TextContainer;
use pocketmine\event\Timings;
use pocketmine\event\TranslationContainer;
use pocketmine\inventory\BigCraftingGrid;
use pocketmine\inventory\BigShapedRecipe;
use pocketmine\inventory\BigShapelessRecipe;
use pocketmine\inventory\CraftingGrid;
use pocketmine\inventory\FurnaceInventory;
use pocketmine\inventory\Inventory;
@ -2775,7 +2773,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$recipe = $this->server->getCraftingManager()->getRecipe($packet->id);
if($recipe === null or (($recipe instanceof BigShapelessRecipe or $recipe instanceof BigShapedRecipe) and $this->craftingType === 0) or count($packet->input) === 0){
if($recipe === null or ($recipe->requiresCraftingTable() and $this->craftingType === 0) or count($packet->input) === 0){
$this->inventory->sendContents($this);
return false;
}

28
src/pocketmine/inventory/BigShapedRecipe.php
View File

@ -1,28 +0,0 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
declare(strict_types=1);
namespace pocketmine\inventory;
class BigShapedRecipe extends ShapedRecipe{
}

28
src/pocketmine/inventory/BigShapelessRecipe.php
View File

@ -1,28 +0,0 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
declare(strict_types=1);
namespace pocketmine\inventory;
class BigShapelessRecipe extends ShapelessRecipe{
}

2
src/pocketmine/inventory/CraftingRecipe.php
View File

@ -36,4 +36,6 @@ interface CraftingRecipe extends Recipe{
* @param UUID $id
*/
public function setId(UUID $id);
public function requiresCraftingTable() : bool;
}

4
src/pocketmine/inventory/ShapedRecipe.php
View File

@ -171,4 +171,8 @@ class ShapedRecipe implements CraftingRecipe{
public function registerToCraftingManager(CraftingManager $manager){
$manager->registerShapedRecipe($this);
}
public function requiresCraftingTable() : bool{
return $this->getHeight() > 2 or $this->getWidth() > 2;
}
}

4
src/pocketmine/inventory/ShapelessRecipe.php
View File

@ -132,4 +132,8 @@ class ShapelessRecipe implements CraftingRecipe{
public function registerToCraftingManager(CraftingManager $manager){
$manager->registerShapelessRecipe($this);
}
public function requiresCraftingTable() : bool{
return count($this->ingredients) > 4;
}
}