From 31138ad3fc2e3b7000047ffa7ddcfba2c878fc50 Mon Sep 17 00:00:00 2001 From: Warrior <50800980+Warriorrrr@users.noreply.github.com> Date: Wed, 9 Aug 2023 01:15:01 +0200 Subject: [PATCH] Fix wild wolves not considering bones interesting (#9579) --- patches/server/Fix-a-bunch-of-vanilla-bugs.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/patches/server/Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/Fix-a-bunch-of-vanilla-bugs.patch index e9752739b5..e539ea6983 100644 --- a/patches/server/Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/Fix-a-bunch-of-vanilla-bugs.patch @@ -51,6 +51,9 @@ https://bugs.mojang.com/browse/MC-123848 https://bugs.mojang.com/browse/MC-264285 Fix unbreakable flint and steel being consumed when igniting creepers +https://bugs.mojang.com/browse/MC-84789 + Fix wild wolves not considering bones interesting + Co-authored-by: William Blake Galbreath diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java @@ -147,6 +150,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 default SoundEvent getSaddleSoundEvent() { return SoundEvents.HORSE_SADDLE; +diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BegGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BegGoal.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/goal/BegGoal.java ++++ b/src/main/java/net/minecraft/world/entity/ai/goal/BegGoal.java +@@ -0,0 +0,0 @@ public class BegGoal extends Goal { + private boolean playerHoldingInteresting(Player player) { + for(InteractionHand interactionHand : InteractionHand.values()) { + ItemStack itemStack = player.getItemInHand(interactionHand); +- if (this.wolf.isTame() && itemStack.is(Items.BONE)) { ++ if (!this.wolf.isTame() && itemStack.is(Items.BONE)) { // Paper - Fix MC-84789 + return true; + } + diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java