Paper/patches/server/0706-Reset-villager-inventory-on-cancelled-pickup-event.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Tue, 1 Jun 2021 22:05:08 -0500
Subject: [PATCH] Reset villager inventory on cancelled pickup event


diff --git a/src/main/java/net/minecraft/world/SimpleContainer.java b/src/main/java/net/minecraft/world/SimpleContainer.java
index 502e29644504aabe3834351d3b479e21bd8f4be7..4e47ea7359ae56efeb2b74161dc9e7387589415b 100644
--- a/src/main/java/net/minecraft/world/SimpleContainer.java
+++ b/src/main/java/net/minecraft/world/SimpleContainer.java
@@ -34,6 +34,16 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
         return this.items;
     }
 
+    // Paper start
+    public void setContents(List<ItemStack> items) {
+        this.items.clear();
+        for(int i = 0; i < items.size(); i++) {
+            this.items.set(i, items.get(i));
+        }
+        this.setChanged();
+    }
+    // Paper end
+
     public void onOpen(CraftHumanEntity who) {
         this.transaction.add(who);
     }
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 2ad93ff0bb46a282df706438b7c039c46323979a..43bb055f0f9ecb82c25e0f47258f45ce4182a75d 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -888,15 +888,19 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
             }
 
             // CraftBukkit start
-            ItemStack remaining = new SimpleContainer(inventorysubcontainer).addItem(itemstack);
-            if (CraftEventFactory.callEntityPickupItemEvent(this, item, remaining.getCount(), false).isCancelled()) {
+            // Paper start
+            List<ItemStack> contentsSnapshot = new java.util.ArrayList<>(inventorysubcontainer.getContents());
+            ItemStack itemstack1 = inventorysubcontainer.addItem(itemstack);
+            if (CraftEventFactory.callEntityPickupItemEvent(this, item, itemstack1.getCount(), false).isCancelled()) {
+                inventorysubcontainer.setContents(contentsSnapshot);
+                // Paper end
                 return;
             }
             // CraftBukkit end
 
             this.onItemPickup(item);
             this.take(item, itemstack.getCount());
-            ItemStack itemstack1 = inventorysubcontainer.addItem(itemstack);
+            // ItemStack itemstack1 = inventorysubcontainer.a(itemstack); // Paper - moved up
 
             if (itemstack1.isEmpty()) {
                 item.discard();