From 905a10e980cb6552bab0bad59cc593852409033d Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Mon, 25 Nov 2024 21:39:35 +0000
Subject: [PATCH] Deprecate InventoryAction->onAddToTransaction() this never
 made any sense

---
 src/inventory/transaction/InventoryTransaction.php  | 13 +++----------
 .../transaction/action/InventoryAction.php          |  1 +
 .../transaction/action/SlotChangeAction.php         |  8 --------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/inventory/transaction/InventoryTransaction.php b/src/inventory/transaction/InventoryTransaction.php
index b3465a8df..47290e401 100644
--- a/src/inventory/transaction/InventoryTransaction.php
+++ b/src/inventory/transaction/InventoryTransaction.php
@@ -111,6 +111,9 @@ class InventoryTransaction{
 		if(!isset($this->actions[$hash = spl_object_id($action)])){
 			$this->actions[$hash] = $action;
 			$action->onAddToTransaction($this);
+			if($action instanceof SlotChangeAction && !isset($this->inventories[$inventoryId = spl_object_id($action->getInventory())])){
+				$this->inventories[$inventoryId] = $action->getInventory();
+			}
 		}else{
 			throw new \InvalidArgumentException("Tried to add the same action to a transaction twice");
 		}
@@ -129,16 +132,6 @@ class InventoryTransaction{
 		$this->actions = $actions;
 	}
 
-	/**
-	 * @internal This method should not be used by plugins, it's used to add tracked inventories for InventoryActions
-	 * involving inventories.
-	 */
-	public function addInventory(Inventory $inventory) : void{
-		if(!isset($this->inventories[$hash = spl_object_id($inventory)])){
-			$this->inventories[$hash] = $inventory;
-		}
-	}
-
 	/**
 	 * @param Item[] $needItems
 	 * @param Item[] $haveItems
diff --git a/src/inventory/transaction/action/InventoryAction.php b/src/inventory/transaction/action/InventoryAction.php
index fff3d22b8..2f0db083c 100644
--- a/src/inventory/transaction/action/InventoryAction.php
+++ b/src/inventory/transaction/action/InventoryAction.php
@@ -60,6 +60,7 @@ abstract class InventoryAction{
 
 	/**
 	 * Called when the action is added to the specified InventoryTransaction.
+	 * @deprecated
 	 */
 	public function onAddToTransaction(InventoryTransaction $transaction) : void{
 
diff --git a/src/inventory/transaction/action/SlotChangeAction.php b/src/inventory/transaction/action/SlotChangeAction.php
index 68c3dba1b..3c9b8e5cf 100644
--- a/src/inventory/transaction/action/SlotChangeAction.php
+++ b/src/inventory/transaction/action/SlotChangeAction.php
@@ -25,7 +25,6 @@ namespace pocketmine\inventory\transaction\action;
 
 use pocketmine\inventory\Inventory;
 use pocketmine\inventory\SlotValidatedInventory;
-use pocketmine\inventory\transaction\InventoryTransaction;
 use pocketmine\inventory\transaction\TransactionValidationException;
 use pocketmine\item\Item;
 use pocketmine\player\Player;
@@ -85,13 +84,6 @@ class SlotChangeAction extends InventoryAction{
 		}
 	}
 
-	/**
-	 * Adds this action's target inventory to the transaction's inventory list.
-	 */
-	public function onAddToTransaction(InventoryTransaction $transaction) : void{
-		$transaction->addInventory($this->inventory);
-	}
-
 	/**
 	 * Sets the item into the target inventory.
 	 */