diff options
| author | Jason Penilla <[email protected]> | 2024-04-26 11:42:17 -0700 |
|---|---|---|
| committer | Jason Penilla <[email protected]> | 2024-04-26 11:45:56 -0700 |
| commit | 1bc278b125eac414943d4096da4a0c0a93e83bb0 (patch) | |
| tree | 67e639a7a67f4e564639e272a925301fc7306d57 | |
| parent | 44e68c301a66443d6af95a832792a9d25f873b0b (diff) | |
| download | Paper-1bc278b125eac414943d4096da4a0c0a93e83bb0.tar.gz Paper-1bc278b125eac414943d4096da4a0c0a93e83bb0.zip | |
Update patched spigot decompiler to fix inconsistency based on processing order
| -rw-r--r-- | build.gradle.kts | 2 | ||||
| -rw-r--r-- | patches/server/0006-MC-Dev-fixes.patch | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 5497e7cc48..093b120567 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -72,7 +72,7 @@ dependencies { paramMappings("net.fabricmc:yarn:1.20.5+build.1:mergedv2") remapper("net.fabricmc:tiny-remapper:0.10.1:fat") decompiler("org.vineflower:vineflower:1.10.1") - spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.12") + spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.13") paperclip("io.papermc:paperclip:3.0.3") } diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/server/0006-MC-Dev-fixes.patch index feb444d777..85a45df3d6 100644 --- a/patches/server/0006-MC-Dev-fixes.patch +++ b/patches/server/0006-MC-Dev-fixes.patch @@ -84,3 +84,16 @@ index 661a6274a800ca9b91bdb809d026972d23c3b263..ea72dcb064a35bc6245bc5c94d592efe } public static <T> SortedArraySet<T> create(Comparator<T> comparator) { +diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java +index 328888db50c7ef7cae8305a6aa19d1af9a8c880d..ac411202c0029052a962b51b015da191b124de5f 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java ++++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java +@@ -62,7 +62,7 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve + protected void registerGoals() { + super.registerGoals(); + this.goalSelector.addGoal(0, new FloatGoal(this)); +- this.goalSelector.addGoal(2, new Raider.HoldGroundAttackGoal(this, this, 10.0F)); ++ this.goalSelector.addGoal(2, new Raider.HoldGroundAttackGoal(this, 10.0F)); // Paper - decomp fix + this.goalSelector.addGoal(3, new RangedCrossbowAttackGoal<>(this, 1.0D, 8.0F)); + this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D)); + this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 15.0F, 1.0F)); |