Merge branch 'master' into 1.20.2

FrozenBlock · Sep 16, 2023 · 77ebad3 · 77ebad3
2 parents 3c32161 + ed942f8
commit 77ebad3
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/src/main/java/net/frozenblock/lib/storage/api/StorageInteraction.java b/src/main/java/net/frozenblock/lib/storage/api/StorageInteraction.java
@@ -31,17 +31,14 @@ public interface StorageInteraction<T> {
 	long moveResources(Storage<T> storage, T resource, long maxAmount, TransactionContext transaction);
 
 	default long moveResources(Storage<T> storage, T resource, long maxAmount, TransactionContext transaction, boolean simulate) {
-		TransactionContext transactionContext = transaction;
-		if (simulate)
-			transactionContext = transaction.openNested();
-
-		long ret = moveResources(storage, resource, maxAmount, transactionContext);
 		if (simulate) {
-			// can safely cast to transaction because openNested returns a Transaction
-			// parent transaction should never be committed or aborted by any means
-			var transaction1 = (Transaction) transaction;
-			transaction1.close();
+			// closes this automatically
+			// check functionality of AutoCloseable class
+			try (Transaction simulateTransaction = Transaction.openNested(transaction)) {
+				return moveResources(storage, resource, maxAmount, simulateTransaction);
+			}
 		}
-        return ret;
+
+		return moveResources(storage, resource, maxAmount, transaction);
     }
 }