Introduce and use TransactionBuilder for inventory evacuations

src/inventory/transaction/TransactionBuilder.php

@@ -0,0 +1,61 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\inventory\transaction;
+
+use pocketmine\inventory\Inventory;
+use pocketmine\inventory\transaction\action\InventoryAction;
+use function spl_object_id;
+
+final class TransactionBuilder{
+
+	/** @var TransactionBuilderInventory[] */
+	private array $inventories = [];
+
+	/** @var InventoryAction[] */
+	private array $extraActions = [];
+
+	public function addAction(InventoryAction $action) : void{
+		$this->extraActions[spl_object_id($action)] = $action;
+	}
+
+	public function getInventory(Inventory $inventory) : TransactionBuilderInventory{
+		$id = spl_object_id($inventory);
+		return $this->inventories[$id] ??= new TransactionBuilderInventory($inventory);
+	}
+
+	/**
+	 * @return InventoryAction[]
+	 */
+	public function generateActions() : array{
+		$actions = $this->extraActions;
+
+		foreach($this->inventories as $inventory){
+			foreach($inventory->generateActions() as $action){
+				$actions[spl_object_id($action)] = $action;
+			}
+		}
+
+		return $actions;
+	}
+}

src/player/Player.php

@@ -85,7 +85,7 @@ use pocketmine\inventory\PlayerCursorInventory;
 use pocketmine\inventory\TemporaryInventory;
 use pocketmine\inventory\transaction\action\DropItemAction;
 use pocketmine\inventory\transaction\InventoryTransaction;
-use pocketmine\inventory\transaction\TransactionBuilderInventory;
+use pocketmine\inventory\transaction\TransactionBuilder;
 use pocketmine\inventory\transaction\TransactionCancelledException;
 use pocketmine\inventory\transaction\TransactionValidationException;
 use pocketmine\item\ConsumableItem;
@@ -2436,29 +2436,23 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 			$inventories[] = $this->currentWindow;
 		}
 
-		$transaction = new InventoryTransaction($this);
+		$builder = new TransactionBuilder();
-		$mainInventoryTransactionBuilder = new TransactionBuilderInventory($this->inventory);
 		foreach($inventories as $inventory){
 			$contents = $inventory->getContents();
 
 			if(count($contents) > 0){
-				$drops = $mainInventoryTransactionBuilder->addItem(...$contents);
+				$drops = $builder->getInventory($this->inventory)->addItem(...$contents);
 				foreach($drops as $drop){
-					$transaction->addAction(new DropItemAction($drop));
+					$builder->addAction(new DropItemAction($drop));
 				}
 
-				$clearedInventoryTransactionBuilder = new TransactionBuilderInventory($inventory);
+				$builder->getInventory($inventory)->clearAll();
-				$clearedInventoryTransactionBuilder->clearAll();
-				foreach($clearedInventoryTransactionBuilder->generateActions() as $action){
-					$transaction->addAction($action);
-				}
 			}
 		}
-		foreach($mainInventoryTransactionBuilder->generateActions() as $action){
-			$transaction->addAction($action);
-		}
 
-		if(count($transaction->getActions()) !== 0){
+		$actions = $builder->generateActions();
+		if(count($actions) !== 0){
+			$transaction = new InventoryTransaction($this, $actions);
 			try{
 				$transaction->execute();
 				$this->logger->debug("Successfully evacuated items from temporary inventories");