diff --git a/Spigot-Server-Patches/0443-Backport-fix-for-MC-167561.patch b/Spigot-Server-Patches/0443-Backport-fix-for-MC-167561.patch new file mode 100644 index 000000000..dc24fbd52 --- /dev/null +++ b/Spigot-Server-Patches/0443-Backport-fix-for-MC-167561.patch @@ -0,0 +1,44 @@ +From 43174d822f93288b9e3a288ccef8b10cc218712b Mon Sep 17 00:00:00 2001 +From: Shane Freeder +Date: Fri, 21 Feb 2020 18:44:28 +0000 +Subject: [PATCH] Backport fix for MC-167561 + + +diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java +index db15d5e0a2..eec1e26b6e 100644 +--- a/src/main/java/net/minecraft/server/EntityWolf.java ++++ b/src/main/java/net/minecraft/server/EntityWolf.java +@@ -296,7 +296,14 @@ public class EntityWolf extends EntityTameableAnimal { + boolean flag = super.a(entityhuman, enumhand); + + if (!flag || this.isBaby()) { +- this.goalSit.setSitting(!this.isSitting()); ++ //this.goalSit.setSitting(!this.isSitting()); // Paper start - copied from below ++ if (this.i((EntityLiving) entityhuman) && !this.i(itemstack)) { ++ this.goalSit.setSitting(!this.isSitting()); ++ this.jumping = false; ++ this.navigation.o(); ++ this.setGoalTarget((EntityLiving) null, TargetReason.FORGOT_TARGET, true); // CraftBukkit - reason ++ } ++ // Paper end - copied from below + } + + return flag; +@@ -313,12 +320,14 @@ public class EntityWolf extends EntityTameableAnimal { + return true; + } + ++ /* Paper start - Move into above + if (this.i((EntityLiving) entityhuman) && !this.i(itemstack)) { + this.goalSit.setSitting(!this.isSitting()); + this.jumping = false; + this.navigation.o(); + this.setGoalTarget((EntityLiving) null, TargetReason.FORGOT_TARGET, true); // CraftBukkit - reason + } ++ */ // Paper end + } else if (item == Items.BONE && !this.isAngry()) { + if (!entityhuman.abilities.canInstantlyBuild) { + itemstack.subtract(1); +-- +2.25.0 +