mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 02:08:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '8ce0022de'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/network/mcpe/protocol/types/inventory/NetworkInventoryAction.php
This commit is contained in:
Dylan K. Taylor
2020-07-04 22:34:01 +01:00
parent 991abe8864 8ce0022de6
commit c35a596079
2 changed files with 113 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/mcpe/convert/TypeConverter.php
View File

@ -38,11 +38,13 @@ use pocketmine\network\mcpe\protocol\types\GameMode as ProtocolGameMode;
use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds;
use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
use pocketmine\network\mcpe\protocol\types\inventory\NetworkInventoryAction;
use pocketmine\network\mcpe\protocol\types\inventory\UIInventorySlotOffset;
use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient;
use pocketmine\player\GameMode;
use pocketmine\player\Player;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\utils\SingletonTrait;
use function array_key_exists;
class TypeConverter{
use SingletonTrait;
@ -168,21 +170,21 @@ class TypeConverter{
switch($action->sourceType){
case NetworkInventoryAction::SOURCE_CONTAINER:
if($action->windowId === ContainerIds::UI and $action->inventorySlot > 0){
if($action->inventorySlot === 50){
if($action->inventorySlot === UIInventorySlotOffset::CREATED_ITEM_OUTPUT){
return null; //useless noise
}
if($action->inventorySlot >= 28 and $action->inventorySlot <= 31){
if(array_key_exists($action->inventorySlot, UIInventorySlotOffset::CRAFTING2X2_INPUT)){
$window = $player->getCraftingGrid();
if($window->getGridWidth() !== CraftingGrid::SIZE_SMALL){
throw new \UnexpectedValueException("Expected small crafting grid");
}
$slot = $action->inventorySlot - 28;
}elseif($action->inventorySlot >= 32 and $action->inventorySlot <= 40){
$slot = UIInventorySlotOffset::CRAFTING2X2_INPUT[$action->inventorySlot];
}elseif(array_key_exists($action->inventorySlot, UIInventorySlotOffset::CRAFTING3X3_INPUT)){
$window = $player->getCraftingGrid();
if($window->getGridWidth() !== CraftingGrid::SIZE_BIG){
throw new \UnexpectedValueException("Expected big crafting grid");
}
$slot = $action->inventorySlot - 32;
$slot = UIInventorySlotOffset::CRAFTING3X3_INPUT[$action->inventorySlot];
}else{
throw new \UnexpectedValueException("Unhandled magic UI slot offset $action->inventorySlot");
}
@ -225,4 +227,4 @@ class TypeConverter{
throw new \UnexpectedValueException("Unknown inventory source type $action->sourceType");
}
}
}
}