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

add handling for -100 fake source type (evacuate crafting table contents)

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-09-13 11:15:31 +01:00
parent 0fac3b9a9d
commit 5267c571e9
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ namespace pocketmine\network\mcpe\protocol\types;
use pocketmine\inventory\transaction\action\CreativeInventoryAction;
use pocketmine\inventory\transaction\action\DropItemAction;
use pocketmine\inventory\transaction\action\InventoryAction;
use pocketmine\inventory\transaction\action\SlotChangeAction;
use pocketmine\item\Item;
use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
@ -137,6 +138,11 @@ class NetworkInventoryAction{
$packet->putSlot($this->newItem);
}
/**
* @param Player $player
*
* @return InventoryAction
*/
public function createInventoryAction(Player $player){
switch($this->sourceType){
case self::SOURCE_CONTAINER:
@ -161,20 +167,38 @@ class NetworkInventoryAction{
case self::SOURCE_CREATIVE:
switch($this->inventorySlot){
case InventoryTransactionPacket::ACTION_MAGIC_SLOT_CREATIVE_DELETE_ITEM:
return new CreativeInventoryAction($this->oldItem, $this->newItem, CreativeInventoryAction::TYPE_DELETE_ITEM);
$type = CreativeInventoryAction::TYPE_DELETE_ITEM;
break;
case InventoryTransactionPacket::ACTION_MAGIC_SLOT_CREATIVE_CREATE_ITEM:
return new CreativeInventoryAction($this->oldItem, $this->newItem, CreativeInventoryAction::TYPE_CREATE_ITEM);
$type = CreativeInventoryAction::TYPE_CREATE_ITEM;
break;
default:
throw new \UnexpectedValueException("Unexpected creative action type $this->inventorySlot");
}
throw new \UnexpectedValueException("Unexpected creative action type $this->inventorySlot");
return new CreativeInventoryAction($this->oldItem, $this->newItem, $type);
case self::SOURCE_TODO:
//These types need special handling.
switch($this->windowId){
case self::SOURCE_TYPE_CRAFTING_ADD_INGREDIENT:
case self::SOURCE_TYPE_CRAFTING_REMOVE_INGREDIENT:
$window = $player->getCraftingGrid();
return new SlotChangeAction($window, $this->inventorySlot, $this->oldItem, $this->newItem);
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);
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
//TODO: more stuff
throw new \UnexpectedValueException("Player " . $player->getName() . " has no open container with window ID $this->windowId");
default:
throw new \UnexpectedValueException("Unknown inventory source type $this->sourceType");