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

Fixed crash when opening crafting table and other 'UI' inventories

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-03-20 22:00:38 +00:00
parent 758b5ee500
commit c9601ae67d
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/network/mcpe/InventoryManager.php
View File

@ -141,10 +141,6 @@ class InventoryManager{
} }
private function addDynamic(Inventory $inventory) : int{ private function addDynamic(Inventory $inventory) : int{
if(isset($this->inventories[spl_object_id($inventory)])){
throw new \InvalidArgumentException("Inventory " . get_class($inventory) . " is already tracked");
}
$this->inventories[spl_object_id($inventory)] = new InventoryManagerEntry($inventory);
$id = $this->getNewWindowId(); $id = $this->getNewWindowId();
$this->add($id, $inventory); $this->add($id, $inventory);
return $id; return $id;
@ -168,6 +164,17 @@ class InventoryManager{
} }
} }
/**
* @param int[]|int $slotMap
* @phpstan-param array<int, int>|int $slotMap
*/
private function addComplexDynamic(array|int $slotMap, Inventory $inventory) : int{
$this->addComplex($slotMap, $inventory);
$id = $this->getNewWindowId();
$this->associateIdWithInventory($id, $inventory);
return $id;
}
private function remove(int $id) : void{ private function remove(int $id) : void{
$inventory = $this->networkIdToInventoryMap[$id]; $inventory = $this->networkIdToInventoryMap[$id];
unset($this->networkIdToInventoryMap[$id]); unset($this->networkIdToInventoryMap[$id]);
@ -296,9 +303,10 @@ class InventoryManager{
$this->onCurrentWindowRemove(); $this->onCurrentWindowRemove();
$this->openWindowDeferred(function() use ($inventory) : void{ $this->openWindowDeferred(function() use ($inventory) : void{
$windowId = $this->addDynamic($inventory);
if(($slotMap = $this->createComplexSlotMapping($inventory)) !== null){ if(($slotMap = $this->createComplexSlotMapping($inventory)) !== null){
$this->addComplex($slotMap, $inventory); $windowId = $this->addComplexDynamic($slotMap, $inventory);
}else{
$windowId = $this->addDynamic($inventory);
} }
foreach($this->containerOpenCallbacks as $callback){ foreach($this->containerOpenCallbacks as $callback){