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

fixup 1.8 crafting, take 2

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-12-13 10:54:15 +00:00
parent fd77dd0066
commit dbeceb02f9
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php
View File

@ -36,6 +36,7 @@ class NetworkInventoryAction{
public const SOURCE_WORLD = 2; //drop/pickup item entity public const SOURCE_WORLD = 2; //drop/pickup item entity
public const SOURCE_CREATIVE = 3; public const SOURCE_CREATIVE = 3;
public const SOURCE_CRAFTING_GRID = 100;
public const SOURCE_TODO = 99999; public const SOURCE_TODO = 99999;
/** /**
@ -107,6 +108,7 @@ class NetworkInventoryAction{
break; break;
case self::SOURCE_CREATIVE: case self::SOURCE_CREATIVE:
break; break;
case self::SOURCE_CRAFTING_GRID:
case self::SOURCE_TODO: case self::SOURCE_TODO:
$this->windowId = $packet->getVarInt(); $this->windowId = $packet->getVarInt();
switch($this->windowId){ switch($this->windowId){
@ -144,6 +146,7 @@ class NetworkInventoryAction{
break; break;
case self::SOURCE_CREATIVE: case self::SOURCE_CREATIVE:
break; break;
case self::SOURCE_CRAFTING_GRID:
case self::SOURCE_TODO: case self::SOURCE_TODO:
$packet->putVarInt($this->windowId); $packet->putVarInt($this->windowId);
break; break;
@ -190,27 +193,17 @@ class NetworkInventoryAction{
} }
return new CreativeInventoryAction($this->oldItem, $this->newItem, $type); return new CreativeInventoryAction($this->oldItem, $this->newItem, $type);
case self::SOURCE_CRAFTING_GRID:
case self::SOURCE_TODO: case self::SOURCE_TODO:
//These types need special handling. //These types need special handling.
switch($this->windowId){ switch($this->windowId){
case self::SOURCE_TYPE_CRAFTING_ADD_INGREDIENT: case self::SOURCE_TYPE_CRAFTING_ADD_INGREDIENT:
case self::SOURCE_TYPE_CRAFTING_REMOVE_INGREDIENT: case self::SOURCE_TYPE_CRAFTING_REMOVE_INGREDIENT:
$window = $player->getCraftingGrid(); case self::SOURCE_TYPE_CONTAINER_DROP_CONTENTS: //TODO: this type applies to all fake windows, not just crafting
return new SlotChangeAction($window, $this->inventorySlot, $this->oldItem, $this->newItem); return new SlotChangeAction($player->getCraftingGrid(), $this->inventorySlot, $this->oldItem, $this->newItem);
case self::SOURCE_TYPE_CRAFTING_RESULT: case self::SOURCE_TYPE_CRAFTING_RESULT:
case self::SOURCE_TYPE_CRAFTING_USE_INGREDIENT: case self::SOURCE_TYPE_CRAFTING_USE_INGREDIENT:
return null; return null;
case self::SOURCE_TYPE_CONTAINER_DROP_CONTENTS:
//TODO: this type applies to all fake windows, not just crafting
$window = $player->getCraftingGrid();
//DROP_CONTENTS doesn't bother telling us what slot the item is in, so we find it ourselves
$inventorySlot = $window->first($this->oldItem, true);
if($inventorySlot === -1){
throw new \InvalidStateException("Fake container " . get_class($window) . " for " . $player->getName() . " does not contain $this->oldItem");
}
return new SlotChangeAction($window, $inventorySlot, $this->oldItem, $this->newItem);
} }
//TODO: more stuff //TODO: more stuff