File tree Expand file tree Collapse file tree 1 file changed +10
-1
lines changed Expand file tree Collapse file tree 1 file changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ index d2dfa49e124460f4762b950f9ded106d2ec15dc2..bc58323801ee16fe9b63c21332144ec0
25
25
}
26
26
27
27
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
29
29
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
30
30
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
31
31
@@ -242,11 +242,16 @@ public class PiglinAi {
@@ -46,6 +46,15 @@ index d3d50ec0f4466464c048449d8a844569c447d59b..0192b62fd66621a72fcf2f20896647e5
46
46
piglin.take(drop, 1);
47
47
itemstack = PiglinAi.removeOneItemFromItemEntity(drop);
48
48
} 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);
49
58
diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
50
59
index 174d246b0a4d0fc9d769aad08da627ca8487bdf2..bbf21ea433f9e3963aac0ede597ed8d3c8e50ed8 100644
51
60
--- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
You can’t perform that action at this time.
0 commit comments