Skip to content

Commit 5625051

Browse files
authored
Prevent duplicate pickup event for piglins (#11322)
1 parent 956b3d1 commit 5625051

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

patches/server/0752-EntityPickupItemEvent-fixes.patch

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ index d2dfa49e124460f4762b950f9ded106d2ec15dc2..bc58323801ee16fe9b63c21332144ec0
2525
}
2626

2727
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
28-
index d3d50ec0f4466464c048449d8a844569c447d59b..0192b62fd66621a72fcf2f20896647e5950ba993 100644
28+
index d3d50ec0f4466464c048449d8a844569c447d59b..b9810a1f6ac91ae9631dd1ebc225f009d91b7845 100644
2929
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
3030
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
3131
@@ -242,11 +242,16 @@ public class PiglinAi {
@@ -46,6 +46,15 @@ index d3d50ec0f4466464c048449d8a844569c447d59b..0192b62fd66621a72fcf2f20896647e5
4646
piglin.take(drop, 1);
4747
itemstack = PiglinAi.removeOneItemFromItemEntity(drop);
4848
} else {
49+
@@ -261,7 +266,7 @@ public class PiglinAi {
50+
} else if (PiglinAi.isFood(itemstack) && !PiglinAi.hasEatenRecently(piglin)) {
51+
PiglinAi.eat(piglin);
52+
} else {
53+
- boolean flag = !piglin.equipItemIfPossible(itemstack, drop).equals(ItemStack.EMPTY); // CraftBukkit
54+
+ boolean flag = !piglin.equipItemIfPossible(itemstack, null).equals(ItemStack.EMPTY); // CraftBukkit // Paper - pass null item entity to prevent duplicate pickup item event call - called above.
55+
56+
if (!flag) {
57+
PiglinAi.putInInventory(piglin, itemstack);
4958
diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
5059
index 174d246b0a4d0fc9d769aad08da627ca8487bdf2..bbf21ea433f9e3963aac0ede597ed8d3c8e50ed8 100644
5160
--- a/src/main/java/net/minecraft/world/entity/raid/Raider.java

0 commit comments

Comments
 (0)