mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-12 14:35:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-08-17 18:38:30 +01:00
commit f35ca147bb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/Player.php
View File

@ -2911,9 +2911,9 @@ 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)){
if($recipe === null or (($recipe instanceof BigShapelessRecipe or $recipe instanceof BigShapedRecipe) and $this->craftingType === 0) or count($packet->input) === 0){
$this->inventory->sendContents($this);
return true;
return false;
}
$canCraft = true;

2
tests/plugins/PocketMine-DevTools

@ -1 +1 @@
Subproject commit b296436579580cc48fc1bdb1b0af4363305991fb
Subproject commit 4ade26741e8050de196e4c12af01b8b42e76e6e7

2
tests/plugins/PocketMine-TesterPlugin

@ -1 +1 @@
Subproject commit 26a03d6d467f7e505a292610078b65c0205e4ed8
Subproject commit e963064839334ce95e297df69bfe8af5fa95ab3a