Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-09 01:37:35 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-6483: Fix cancelling EntityPickupEvent for villagers

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2021-06-01 18:52:49 +10:00
parent 14af2c0a70
commit 2784d9c66a
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
paper-server/nms-patches/net/minecraft/world/InventorySubcontainer.patch
View File

@ -1,6 +1,6 @@
--- a/net/minecraft/world/InventorySubcontainer.java
+++ b/net/minecraft/world/InventorySubcontainer.java
@@ -13,13 +13,64 @@
@@ -13,13 +13,69 @@
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
@ -54,6 +54,11 @@
+ public Location getLocation() {
+ return null;
+ }
+
+ public InventorySubcontainer(InventorySubcontainer original) {
+ this.a = original.a;
+ this.items = NonNullList.a(ItemStack.b, original.items.toArray(ItemStack[]::new));
+ }
+
public InventorySubcontainer(int i) {
+ this(i, null);

12
paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillager.patch
View File

@ -90,24 +90,20 @@
this.fq();
this.die();
} else {
@@ -791,9 +811,16 @@
@@ -791,6 +811,13 @@
return;
}
+ // CraftBukkit start
+ ItemStack itemstack1 = inventorysubcontainer.a(itemstack);
+ if (CraftEventFactory.callEntityPickupItemEvent(this, entityitem, itemstack1.getCount(), false).isCancelled()) {
+ ItemStack remaining = new InventorySubcontainer(inventorysubcontainer).a(itemstack);
+ if (CraftEventFactory.callEntityPickupItemEvent(this, entityitem, remaining.getCount(), false).isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
+
this.a(entityitem);
this.receive(entityitem, itemstack.getCount());
- ItemStack itemstack1 = inventorysubcontainer.a(itemstack);
+ // ItemStack itemstack1 = inventorysubcontainer.a(itemstack); // CraftBukkit - moved up
if (itemstack1.isEmpty()) {
entityitem.die();
ItemStack itemstack1 = inventorysubcontainer.a(itemstack);
@@ -903,7 +930,7 @@
if (entityirongolem != null) {