core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Auto] Updated Upstream (CraftBukkit) 

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:
ebe18b9b0 SPIGOT-6487: Fix issue with villagers picking up items in certain situations
This commit is contained in:
Aikar 2021-06-02 22:27:31 -04:00
parent 5d05da2579
commit af1a50993f
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/0754-Reset-villager-inventory-on-cancelled-pickup-event.patch
View File

@ -5,7 +5,7 @@ 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 diff --git a/src/main/java/net/minecraft/world/InventorySubcontainer.java b/src/main/java/net/minecraft/world/InventorySubcontainer.java
index 6bbecc5ae98b4e3b480e89139354e5861eda344d..fc18c6c3d4b970552d2fdb64d4225ab1924ddf8f 100644 index 12dad3fe0eee8b0cd8959df6dba449d90bc95844..b8aca5f1c950c8ab28c432d93a6cec5d32e48b9e 100644
--- a/src/main/java/net/minecraft/world/InventorySubcontainer.java --- a/src/main/java/net/minecraft/world/InventorySubcontainer.java
+++ b/src/main/java/net/minecraft/world/InventorySubcontainer.java +++ b/src/main/java/net/minecraft/world/InventorySubcontainer.java
@@ -34,6 +34,16 @@ public class InventorySubcontainer implements IInventory, AutoRecipeOutput { @@ -34,6 +34,16 @@ public class InventorySubcontainer implements IInventory, AutoRecipeOutput {
@ -25,7 +25,7 @@ index 6bbecc5ae98b4e3b480e89139354e5861eda344d..fc18c6c3d4b970552d2fdb64d4225ab1
public void onOpen(CraftHumanEntity who) { public void onOpen(CraftHumanEntity who) {
transaction.add(who); transaction.add(who);
} }
@@ -146,6 +156,7 @@ public class InventorySubcontainer implements IInventory, AutoRecipeOutput { @@ -148,6 +158,7 @@ public class InventorySubcontainer implements IInventory, AutoRecipeOutput {
return itemstack; return itemstack;
} }

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 90a4d64a9a73ab46cf7a87ddd86bf5795154dad9 Subproject commit ebe18b9b0ea94fcec32accc5132d33fe43923455