mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-05 01:16:15 +00:00
Code Issues Projects Releases Wiki Activity

Make CombinedInventoryProxy listener a bit less nasty

Browse Source
This commit is contained in:
Dylan K. Taylor
2025-09-03 18:18:03 +01:00
parent 6610a19640
commit 82323cc7ca
1 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/inventory/CombinedInventoryProxy.php
View File

@ -26,7 +26,6 @@ namespace pocketmine\inventory;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\VanillaItems; use pocketmine\item\VanillaItems;
use pocketmine\player\InventoryWindow; use pocketmine\player\InventoryWindow;
use pocketmine\utils\AssumptionFailedError;
use function array_fill_keys; use function array_fill_keys;
use function array_keys; use function array_keys;
use function array_map; use function array_map;
@ -85,39 +84,42 @@ final class CombinedInventoryProxy extends BaseInventory{
$this->size = $combinedSize; $this->size = $combinedSize;
$weakThis = \WeakReference::create($this); $weakThis = \WeakReference::create($this);
$getThis = static fn() => $weakThis->get() ?? throw new AssumptionFailedError("Listener should've been unregistered in __destruct()");
$this->backingInventoryListener = new CallbackInventoryListener( $this->backingInventoryListener = new CallbackInventoryListener(
onSlotChange: static function(Inventory $inventory, int $slot, Item $oldItem) use ($getThis) : void{ static fn(Inventory $inventory, int $slot, Item $oldItem) => $weakThis->get()?->onBackingSlotChange($inventory, $slot, $oldItem),
$strongThis = $getThis(); static fn(Inventory $inventory, array $oldContents) => $weakThis->get()?->onBackingContentChange($inventory, $oldContents)
if($strongThis->modifyingBackingInventory){
return;
}
$offset = $strongThis->inventoryToOffsetMap[spl_object_id($inventory)];
$strongThis->onSlotChange($offset + $slot, $oldItem);
},
onContentChange: static function(Inventory $inventory, array $oldContents) use ($getThis) : void{
$strongThis = $getThis();
if($strongThis->modifyingBackingInventory){
return;
}
if(count($strongThis->backingInventories) === 1){
$strongThis->onContentChange($oldContents);
}else{
$offset = $strongThis->inventoryToOffsetMap[spl_object_id($inventory)];
for($slot = 0, $limit = $inventory->getSize(); $slot < $limit; $slot++){
$strongThis->onSlotChange($offset + $slot, $oldContents[$slot] ?? VanillaItems::AIR());
}
}
}
); );
foreach($this->backingInventories as $inventory){ foreach($this->backingInventories as $inventory){
$inventory->getListeners()->add($this->backingInventoryListener); $inventory->getListeners()->add($this->backingInventoryListener);
} }
} }
private function onBackingSlotChange(Inventory $inventory, int $slot, Item $oldItem) : void{
if($this->modifyingBackingInventory){
return;
}
$offset = $this->inventoryToOffsetMap[spl_object_id($inventory)];
$this->onSlotChange($offset + $slot, $oldItem);
}
/**
* @param Item[] $oldContents
*/
private function onBackingContentChange(Inventory $inventory, array $oldContents) : void{
if($this->modifyingBackingInventory){
return;
}
if(count($this->backingInventories) === 1){
$this->onContentChange($oldContents);
}else{
$offset = $this->inventoryToOffsetMap[spl_object_id($inventory)];
for($slot = 0, $limit = $inventory->getSize(); $slot < $limit; $slot++){
$this->onSlotChange($offset + $slot, $oldContents[$slot] ?? VanillaItems::AIR());
}
}
}
public function __destruct(){ public function __destruct(){
foreach($this->backingInventories as $inventory){ foreach($this->backingInventories as $inventory){
$inventory->getListeners()->remove($this->backingInventoryListener); $inventory->getListeners()->remove($this->backingInventoryListener);