From 8b9ddf18599dc583fd93be732698437923214f30 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 10 Feb 2025 12:24:57 -0800 Subject: [PATCH] Update Paper --- .../paper-patches/features/0004-Add-TPS-From-Region.patch | 8 ++++---- .../paper-patches/features/0006-Add-TPS-From-Region.patch | 4 ++-- .../paper/configuration/GlobalConfiguration.java.patch | 2 +- .../java/org/bukkit/craftbukkit/CraftServer.java.patch | 4 ++-- gradle.properties | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/folia-api/paper-patches/features/0004-Add-TPS-From-Region.patch b/folia-api/paper-patches/features/0004-Add-TPS-From-Region.patch index 7d1cbb8..8859a33 100644 --- a/folia-api/paper-patches/features/0004-Add-TPS-From-Region.patch +++ b/folia-api/paper-patches/features/0004-Add-TPS-From-Region.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add TPS From Region diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 9196b1e62b328b1e9790b966600aba9681dd0ddc..86192033979d78f6308451b024995eac963af9ab 100644 +index 9764489c0801eecb8bbfb06103607f0902bf23ab..2c6b91ca3c55a8f3be4cdf83ba08eca489bb273a 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2975,6 +2975,42 @@ public final class Bukkit { +@@ -2979,6 +2979,42 @@ public final class Bukkit { return server.isGlobalTickThread(); } // Paper end - Folia region threading API @@ -52,10 +52,10 @@ index 9196b1e62b328b1e9790b966600aba9681dd0ddc..86192033979d78f6308451b024995eac @NotNull public static Server.Spigot spigot() { diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 11923ef0ea75f702273ba5481ac6d46cc0f17697..4cad7f842418b0702575db29cc79dcfcc207d589 100644 +index fa6f9d50577059d99ee98662497f3fc049fa74ac..f1024b26cf39647f8889500aad63e01ddc109c3e 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2654,4 +2654,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2658,4 +2658,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value); // Paper end - API to check if the server is sleeping diff --git a/folia-server/paper-patches/features/0006-Add-TPS-From-Region.patch b/folia-server/paper-patches/features/0006-Add-TPS-From-Region.patch index 2179a1d..6f0d65e 100644 --- a/folia-server/paper-patches/features/0006-Add-TPS-From-Region.patch +++ b/folia-server/paper-patches/features/0006-Add-TPS-From-Region.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add TPS From Region diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b254cab566110c590ba22b0bd48cc165bfd7ae27..bcd17eba9798747010ed96903992939a284199df 100644 +index 1635250e7df04b91f5a0ac6442bf5fa46157bf03..bb1a8220174a2882c7056733536f57586044dc75 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3349,4 +3349,68 @@ public final class CraftServer implements Server { +@@ -3339,4 +3339,68 @@ public final class CraftServer implements Server { this.console.addPluginAllowingSleep(plugin.getName(), value); } // Paper end - API to check if the server is sleeping diff --git a/folia-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch b/folia-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch index a77203a..a022543 100644 --- a/folia-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch +++ b/folia-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -@@ -395,4 +_,17 @@ +@@ -396,4 +_,17 @@ } } } diff --git a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch index adbcce6..9011bd4 100644 --- a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch +++ b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch @@ -91,7 +91,7 @@ //Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot unload a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes. if (world == null) { return false; -@@ -3083,11 +_,27 @@ +@@ -3073,11 +_,27 @@ @Override public double[] getTPS() { @@ -122,7 +122,7 @@ } // Paper start - adventure sounds -@@ -3258,7 +_,7 @@ +@@ -3248,7 +_,7 @@ @Override public int getCurrentTick() { diff --git a/gradle.properties b/gradle.properties index 5c4d8b3..c66364f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=dev.folia version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -paperRef=5395ae37bd372235390d28292ed582d0c4fc23dd +paperRef=cafef9ce9bb73cbcb9bc9c59eb982ae2516f5ee6 org.gradle.configuration-cache=true org.gradle.caching=true