mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-12 09:51:12 +01:00
22 lines
1.4 KiB
Diff
22 lines
1.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
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 9f220cf0668b5153c419215e8e25e418e765a1d6..bf133cd7f6187253616fec331762e55dce73487c 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
|
||
|
|
@@ -388,7 +388,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
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|