From df8f13c8dbf2e0b04b3e67318e1539908f6a5c77 Mon Sep 17 00:00:00 2001 From: booky10 Date: Sun, 26 Nov 2023 03:44:07 +0100 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@ed753d3 Re-add missing vanilla safeMode arg PaperMC/Paper@334b2f2 Fix max nearby entities class check (#9967) PaperMC/Paper@faa2f47 Lazily create LootContext for criterions (#9969) PaperMC/Paper@8280211 Fix yaw being ignored for first spawn pos (#9959) PaperMC/Paper@8eac3e1 Don't fire EntityPotionEffectEvent during worldgen (#9965) PaperMC/Paper@0b20f94 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9953) PaperMC/Paper@f9938d3 Fix plugin bootstrap dependency tree population (#9963) PaperMC/Paper@b37bbcf Use ? super in Consumer/Predicate API (#9939) --- gradle.properties | 2 +- patches/server/0003-Pufferfish-Server-Patches.patch | 10 +++++----- patches/server/0004-Change-branding.patch | 6 +++--- patches/server/0005-Add-CloudPlane-configuration.patch | 6 +++--- ...rt-argument-for-changing-pufferfish-config-lo.patch | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index cc4869c..cdc3b82 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ version = 1.20.2-R0.1-SNAPSHOT mcVersion = 1.20.2 packageVersion = 1_20_R2 -paperRef = 96d5e6ca481591842f44d05ab2451f943be6a7c7 +paperRef = b37bbcfd984a325c47d6dee200634b5fa189c64b org.gradle.jvmargs = -Xmx2G diff --git a/patches/server/0003-Pufferfish-Server-Patches.patch b/patches/server/0003-Pufferfish-Server-Patches.patch index 5802177..628b70b 100644 --- a/patches/server/0003-Pufferfish-Server-Patches.patch +++ b/patches/server/0003-Pufferfish-Server-Patches.patch @@ -2308,7 +2308,7 @@ index c88d5b9125f6ee43bf2be60fd1745d836f271b78..74280d3e1cb7d485ed4e87e546afc8a4 this.tickIceAndSnow(flag, blockposition, chunk); } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f71a4a8307fb092d33545e12d253e0b80c884168..aea0b628a1510b1dad1e7bf022c251efc05c27f4 100644 +index 08980763020a13ab49dc7d637625a4fba56da8c9..8a73ceb28981ecd5011a36e0f34d2de399bf3e52 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1250,6 +1250,7 @@ public class ServerPlayer extends Player { @@ -2685,7 +2685,7 @@ index 73871f456a85bda1e51f54986d0e61fb629822e8..ce61b4e067c94742043bef71a252a15d return (EntityType) Registry.register(BuiltInRegistries.ENTITY_TYPE, id, (EntityType) type.build(id)); // CraftBukkit - decompile error } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a76eb3d051db0229ed088b71c92ff3f131449007..919b5e1edf0a9137e7268e46272d1957fd410ebe 100644 +index 87134e57a57df0fceda903e35d22f3f2de31adf3..28cdcf38c0534ad75a85568d6613e4ba63ff3210 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -414,7 +414,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -2697,7 +2697,7 @@ index a76eb3d051db0229ed088b71c92ff3f131449007..919b5e1edf0a9137e7268e46272d1957 this.hurt(this.damageSources().inWall(), 1.0F); } else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) { double d0 = this.level().getWorldBorder().getDistanceToBorder(this) + this.level().getWorldBorder().getDamageSafeZone(); -@@ -1401,6 +1401,16 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1409,6 +1409,16 @@ public abstract class LivingEntity extends Entity implements Attackable { return this.getHealth() <= 0.0F; } @@ -2714,7 +2714,7 @@ index a76eb3d051db0229ed088b71c92ff3f131449007..919b5e1edf0a9137e7268e46272d1957 @Override public boolean hurt(DamageSource source, float amount) { if (this.isInvulnerableTo(source)) { -@@ -1996,6 +2006,20 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2004,6 +2014,20 @@ public abstract class LivingEntity extends Entity implements Attackable { return this.lastClimbablePos; } @@ -3988,7 +3988,7 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7 @Nullable diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9c08303de2891de92e06de8a939a618b7a6f7321..84fc6392dae77084718dc15fc58213c723d65a70 100644 +index 356107688a5d40d1c462b164f61af82f4dfd3926..a1c1ae5e2560bc462bf1786c06ab55053e118abc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1124,6 +1124,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0004-Change-branding.patch b/patches/server/0004-Change-branding.patch index 06a648d..ff863bb 100644 --- a/patches/server/0004-Change-branding.patch +++ b/patches/server/0004-Change-branding.patch @@ -118,7 +118,7 @@ index 8d1a845d0cca6c37f331bb8a007623d67808b304..41e41e4df05d45c49bc929bcbccf83ea public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 84fc6392dae77084718dc15fc58213c723d65a70..eec926d9ba690931f2e478cdec43eaaec71ee40a 100644 +index a1c1ae5e2560bc462bf1786c06ab55053e118abc..cd18650f091f7ae183b336b0833a0c62c508d80b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper @@ -131,10 +131,10 @@ index 84fc6392dae77084718dc15fc58213c723d65a70..eec926d9ba690931f2e478cdec43eaae private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 2af0068ef338634d1f44532af5db66c2d0b3dd10..cfcf23851909a7902cad16dcebf5bd414d79b4af 100644 +index c737c5d62407337d3db2899cfc01713a058a6467..3072857d674327912b7adf770966cfee6668c33f 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -300,7 +300,7 @@ public class Main { +@@ -301,7 +301,7 @@ public class Main { if (buildDate.before(deadline.getTime())) { // Paper start - This is some stupid bullshit System.err.println("*** Warning, you've not updated in a while! ***"); diff --git a/patches/server/0005-Add-CloudPlane-configuration.patch b/patches/server/0005-Add-CloudPlane-configuration.patch index 725590c..fd0a6d2 100644 --- a/patches/server/0005-Add-CloudPlane-configuration.patch +++ b/patches/server/0005-Add-CloudPlane-configuration.patch @@ -249,7 +249,7 @@ index 62519cafcf1488d3ca023b49b35d019b4cf1c597..7ba77eb9600514d1a6f5ab7515aa2b43 this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index eec926d9ba690931f2e478cdec43eaaec71ee40a..35e07766a93c480090212d655e7105a267cec8ea 100644 +index cd18650f091f7ae183b336b0833a0c62c508d80b..af4b1c5da85a125fdf6724bde4c5e822f0695014 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1041,6 +1041,7 @@ public final class CraftServer implements Server { @@ -275,10 +275,10 @@ index eec926d9ba690931f2e478cdec43eaaec71ee40a..35e07766a93c480090212d655e7105a2 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index cfcf23851909a7902cad16dcebf5bd414d79b4af..4eb45de81fdfe765d8e6a8c2c9846d4685b29baa 100644 +index 3072857d674327912b7adf770966cfee6668c33f..eb8f24293bbdec7c0ccb479cae7b41e4ac12302f 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -173,6 +173,14 @@ public class Main { +@@ -174,6 +174,14 @@ public class Main { .describedAs("Jar file"); // Paper end diff --git a/patches/server/0009-Add-start-argument-for-changing-pufferfish-config-lo.patch b/patches/server/0009-Add-start-argument-for-changing-pufferfish-config-lo.patch index b0a7153..9f7494b 100644 --- a/patches/server/0009-Add-start-argument-for-changing-pufferfish-config-lo.patch +++ b/patches/server/0009-Add-start-argument-for-changing-pufferfish-config-lo.patch @@ -46,10 +46,10 @@ index 219f91409f7e4624abcba6c9c70ee8c0fa9fc89c..720db1c8e1fb66ceb157a3a29c932d8e this.setPvpAllowed(dedicatedserverproperties.pvp); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 4eb45de81fdfe765d8e6a8c2c9846d4685b29baa..58e2aa17fbd6752eef47fd0c9b6160e7bc43db67 100644 +index eb8f24293bbdec7c0ccb479cae7b41e4ac12302f..2b8bad2139b0d10cfdc6fcf931dd504608858010 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -179,6 +179,12 @@ public class Main { +@@ -180,6 +180,12 @@ public class Main { .ofType(File.class) .defaultsTo(new File("cloudplane.yml")) .describedAs("Yml file");