From 7cb462c4acb7bbd0da2091a1363521694540bba4 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 21 Feb 2020 18:46:00 +0000 Subject: [PATCH] Backport fix for MC-167561 (Fixes #2886, closes#2960) --- .../Backport-fix-for-MC-167561.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 Spigot-Server-Patches/Backport-fix-for-MC-167561.patch diff --git a/Spigot-Server-Patches/Backport-fix-for-MC-167561.patch b/Spigot-Server-Patches/Backport-fix-for-MC-167561.patch new file mode 100644 index 0000000000..0b72c44fd1 --- /dev/null +++ b/Spigot-Server-Patches/Backport-fix-for-MC-167561.patch @@ -0,0 +1,42 @@ +From 0000000000000000000000000000000000000000 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 +@@ -0,0 +0,0 @@ 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; +@@ -0,0 +0,0 @@ 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); +-- \ No newline at end of file