From fcee09cab2d051fdb7002968465c6db495dad018 Mon Sep 17 00:00:00 2001
From: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
Date: Fri, 27 Mar 2020 16:10:21 -0700
Subject: [PATCH] Fix ownership leak in ItemStackHandler (#6580)

- Triggered by invoking ItemStackHandler#extractItem with `simulate=true`
---
 .../java/net/minecraftforge/items/ItemStackHandler.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraftforge/items/ItemStackHandler.java b/src/main/java/net/minecraftforge/items/ItemStackHandler.java
index 8302e5197b..f8b0316e2d 100644
--- a/src/main/java/net/minecraftforge/items/ItemStackHandler.java
+++ b/src/main/java/net/minecraftforge/items/ItemStackHandler.java
@@ -141,8 +141,12 @@ public class ItemStackHandler implements IItemHandler, IItemHandlerModifiable, I
             {
                 this.stacks.set(slot, ItemStack.EMPTY);
                 onContentsChanged(slot);
+                return existing;
+            }
+            else
+            {
+                return existing.copy();
             }
-            return existing;
         }
         else
         {