wzp/Folia
1
0
Fork 0
mirror of https://github.com/PaperMC/Folia.git synced 2025-04-23 04:39:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update Paper

Browse Source
This commit is contained in:
Spottedleaf 2025-02-10 12:24:57 -08:00
parent 3af04d9c6a
commit 8b9ddf1859
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
folia-api/paper-patches/features/0004-Add-TPS-From-Region.patch
View File

@ -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 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 --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/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(); return server.isGlobalTickThread();
} }
// Paper end - Folia region threading API // Paper end - Folia region threading API
@ -52,10 +52,10 @@ index 9196b1e62b328b1e9790b966600aba9681dd0ddc..86192033979d78f6308451b024995eac
@NotNull @NotNull
public static Server.Spigot spigot() { public static Server.Spigot spigot() {
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java 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 --- a/src/main/java/org/bukkit/Server.java
+++ b/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); void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
// Paper end - API to check if the server is sleeping // Paper end - API to check if the server is sleeping

4
folia-server/paper-patches/features/0006-Add-TPS-From-Region.patch
View File

@ -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 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 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/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); this.console.addPluginAllowingSleep(plugin.getName(), value);
} }
// Paper end - API to check if the server is sleeping // Paper end - API to check if the server is sleeping

2
folia-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch
View File

@ -1,6 +1,6 @@
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/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 @@
} }
} }
} }

4
folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch
View File

@ -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. //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) { if (world == null) {
return false; return false;
@@ -3083,11 +_,27 @@ @@ -3073,11 +_,27 @@
@Override @Override
public double[] getTPS() { public double[] getTPS() {
@ -122,7 +122,7 @@
} }
// Paper start - adventure sounds // Paper start - adventure sounds
@@ -3258,7 +_,7 @@ @@ -3248,7 +_,7 @@
@Override @Override
public int getCurrentTick() { public int getCurrentTick() {

2
gradle.properties
View File

@ -2,7 +2,7 @@ group=dev.folia
version=1.21.4-R0.1-SNAPSHOT version=1.21.4-R0.1-SNAPSHOT
mcVersion=1.21.4 mcVersion=1.21.4
paperRef=5395ae37bd372235390d28292ed582d0c4fc23dd paperRef=cafef9ce9bb73cbcb9bc9c59eb982ae2516f5ee6
org.gradle.configuration-cache=true org.gradle.configuration-cache=true
org.gradle.caching=true org.gradle.caching=true