From bb5486d3724748b27a86a7867ea325454709adba Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Tue, 1 Jun 2021 12:19:10 +0200
Subject: [PATCH] Updated Upstream (CraftBukkit) (#5762)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
90a4d64a Remove usage of Java 11 method not caught by animal sniffer
c51c0f7f SPIGOT-6483: Fix cancelling EntityPickupEvent for villagers
---
...-inventory-on-cancelled-pickup-event.patch | 42 -------------------
work/CraftBukkit | 2 +-
2 files changed, 1 insertion(+), 43 deletions(-)
delete mode 100644 Spigot-Server-Patches/Reset-villager-inventory-on-cancelled-pickup-event.patch
diff --git a/Spigot-Server-Patches/Reset-villager-inventory-on-cancelled-pickup-event.patch b/Spigot-Server-Patches/Reset-villager-inventory-on-cancelled-pickup-event.patch
deleted file mode 100644
index ca14363970..0000000000
--- a/Spigot-Server-Patches/Reset-villager-inventory-on-cancelled-pickup-event.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Fri, 28 May 2021 06:48:48 -0500
-Subject: [PATCH] Reset villager inventory on cancelled pickup event
-
-
-diff --git a/src/main/java/net/minecraft/world/InventorySubcontainer.java b/src/main/java/net/minecraft/world/InventorySubcontainer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/InventorySubcontainer.java
-+++ b/src/main/java/net/minecraft/world/InventorySubcontainer.java
-@@ -0,0 +0,0 @@ public class InventorySubcontainer implements IInventory, AutoRecipeOutput {
- 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.update();
-+ }
-+ // Paper end
-+
- public void onOpen(CraftHumanEntity who) {
- transaction.add(who);
- }
-diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
-@@ -0,0 +0,0 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
- }
-
- // CraftBukkit start
-+ List<ItemStack> contentsSnapshot = new java.util.ArrayList<>(inventorysubcontainer.getContents()); // Paper
- ItemStack itemstack1 = inventorysubcontainer.a(itemstack);
- if (CraftEventFactory.callEntityPickupItemEvent(this, entityitem, itemstack1.getCount(), false).isCancelled()) {
-+ inventorysubcontainer.setContents(contentsSnapshot); // Paper
- return;
- }
- // CraftBukkit end
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 769a579cb0..90a4d64a9a 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 769a579cb0f61467b3ce0e0ae0e5a2bff352f524
+Subproject commit 90a4d64a9a73ab46cf7a87ddd86bf5795154dad9