aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0743-Fix-custom-piglin-loved-items.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0743-Fix-custom-piglin-loved-items.patch')
-rw-r--r--patches/server/0743-Fix-custom-piglin-loved-items.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/patches/server/0743-Fix-custom-piglin-loved-items.patch b/patches/server/0743-Fix-custom-piglin-loved-items.patch
new file mode 100644
index 0000000000..358bd47f1e
--- /dev/null
+++ b/patches/server/0743-Fix-custom-piglin-loved-items.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Mon, 4 Jul 2022 21:50:44 -0700
+Subject: [PATCH] Fix custom piglin loved items
+
+Upstream didn't modify the isLovedItem check in wantsToPickup
+so piglins never actually tried to pickup interestItems
+
+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
+index 4f3048615a34fc2c067e09aec76af94cde6a74e0..5c26beef2d3f3d4afa51950ddeb7089989218462 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
++++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
+@@ -405,7 +405,7 @@ public class PiglinAi {
+ } else {
+ boolean flag = piglin.canAddToInventory(stack);
+
+- return stack.is(Items.GOLD_NUGGET) ? flag : (PiglinAi.isFood(stack) ? !PiglinAi.hasEatenRecently(piglin) && flag : (!PiglinAi.isLovedItem(stack) ? piglin.canReplaceCurrentItem(stack) : PiglinAi.isNotHoldingLovedItemInOffHand(piglin) && flag));
++ return stack.is(Items.GOLD_NUGGET) ? flag : (PiglinAi.isFood(stack) ? !PiglinAi.hasEatenRecently(piglin) && flag : (!PiglinAi.isLovedItem(stack, piglin) ? piglin.canReplaceCurrentItem(stack) : PiglinAi.isNotHoldingLovedItemInOffHand(piglin) && flag)); // Paper - upstream missed isLovedItem check
+ }
+ }
+