From fdb31d60e43e6184b8c66c0f7f72815abb570895 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Tue, 11 Oct 2022 00:05:10 +0000 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@7674547 Fix MC-121706 (#1150) --- patches/api/0001-Pufferfish-API-Changes.patch | 2 +- patches/api/0002-Purpur-API-Changes.patch | 2 +- .../0001-Pufferfish-Server-Changes.patch | 2 +- .../server/0002-Purpur-Server-Changes.patch | 18 +++++++++++++++++- upstream-data | 2 +- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch index 78d0c83..f785cb2 100644 --- a/patches/api/0001-Pufferfish-API-Changes.patch +++ b/patches/api/0001-Pufferfish-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Mon, 10 Oct 2022 09:00:41 +0000 +Date: Mon, 10 Oct 2022 23:53:48 +0000 Subject: [PATCH] Pufferfish API Changes Original by Kevin Raneri diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch index f055960..a215821 100644 --- a/patches/api/0002-Purpur-API-Changes.patch +++ b/patches/api/0002-Purpur-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Mon, 10 Oct 2022 09:02:37 +0000 +Date: Mon, 10 Oct 2022 23:55:55 +0000 Subject: [PATCH] Purpur API Changes Original by PurpurMC Team diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index 91160e7..12f8784 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Mon, 10 Oct 2022 09:00:41 +0000 +Date: Mon, 10 Oct 2022 23:53:48 +0000 Subject: [PATCH] Pufferfish Server Changes Original by Kevin Raneri diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch index f692a23..b8685cf 100644 --- a/patches/server/0002-Purpur-Server-Changes.patch +++ b/patches/server/0002-Purpur-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Mon, 10 Oct 2022 09:02:37 +0000 +Date: Mon, 10 Oct 2022 23:55:55 +0000 Subject: [PATCH] Purpur Server Changes Original by PurpurMC Team @@ -5770,6 +5770,22 @@ index 721971f7618751a2e95f1c49fdc48a9c0c672cab..ad30f2d678cfc4b0d693e84e6e152c63 if (this.llama.inCaravan() && this.llama.getCaravanHead().isAlive() && this.firstIsLeashed(this.llama, 0)) { double d = this.llama.distanceToSqr(this.llama.getCaravanHead()); if (d > 676.0D) { +diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java +index 6558b0d4bea99948fdc2b51751f3cfdc239d4b67..d85dabebbbbe213e791b8a3be3c6df05b959e40c 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java ++++ b/src/main/java/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java +@@ -111,9 +111,9 @@ public class RangedBowAttackGoal extends Go + + this.mob.getMoveControl().strafe(this.strafingBackwards ? -0.5F : 0.5F, this.strafingClockwise ? 0.5F : -0.5F); + this.mob.lookAt(livingEntity, 30.0F, 30.0F); +- } else { ++ } //else { // Purpur - fix MC-121706 + this.mob.getLookControl().setLookAt(livingEntity, 30.0F, 30.0F); +- } ++ //} // Purpur + + if (this.mob.isUsingItem()) { + if (!bl && this.seeTime < -60) { diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java index bd0cbf4390fc7d00b4bd5008cdf8f6f49df4f69b..27e96c4c1377c49f03df032683aac32d96ae1c6f 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java diff --git a/upstream-data b/upstream-data index 1e70115..5113dc1 100644 --- a/upstream-data +++ b/upstream-data @@ -1,2 +1,2 @@ -purpur = 38313f701e465f9a130d2bf4400fd5f9212ac34a +purpur = 767454769ee8ad4772e97777897a5cc895639400 pufferfish = 9d9a0e1a32466455cd3c3eff5b673a9e177491d6