Skip to content

Commit 8b9ddf1

Browse files
committed
Update Paper
1 parent 3af04d9 commit 8b9ddf1

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add TPS From Region
55

66

77
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
8-
index 9196b1e62b328b1e9790b966600aba9681dd0ddc..86192033979d78f6308451b024995eac963af9ab 100644
8+
index 9764489c0801eecb8bbfb06103607f0902bf23ab..2c6b91ca3c55a8f3be4cdf83ba08eca489bb273a 100644
99
--- a/src/main/java/org/bukkit/Bukkit.java
1010
+++ b/src/main/java/org/bukkit/Bukkit.java
11-
@@ -2975,6 +2975,42 @@ public final class Bukkit {
11+
@@ -2979,6 +2979,42 @@ public final class Bukkit {
1212
return server.isGlobalTickThread();
1313
}
1414
// Paper end - Folia region threading API
@@ -52,10 +52,10 @@ index 9196b1e62b328b1e9790b966600aba9681dd0ddc..86192033979d78f6308451b024995eac
5252
@NotNull
5353
public static Server.Spigot spigot() {
5454
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
55-
index 11923ef0ea75f702273ba5481ac6d46cc0f17697..4cad7f842418b0702575db29cc79dcfcc207d589 100644
55+
index fa6f9d50577059d99ee98662497f3fc049fa74ac..f1024b26cf39647f8889500aad63e01ddc109c3e 100644
5656
--- a/src/main/java/org/bukkit/Server.java
5757
+++ b/src/main/java/org/bukkit/Server.java
58-
@@ -2654,4 +2654,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
58+
@@ -2658,4 +2658,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
5959
*/
6060
void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
6161
// Paper end - API to check if the server is sleeping

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add TPS From Region
55

66

77
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
8-
index b254cab566110c590ba22b0bd48cc165bfd7ae27..bcd17eba9798747010ed96903992939a284199df 100644
8+
index 1635250e7df04b91f5a0ac6442bf5fa46157bf03..bb1a8220174a2882c7056733536f57586044dc75 100644
99
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1010
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
11-
@@ -3349,4 +3349,68 @@ public final class CraftServer implements Server {
11+
@@ -3339,4 +3339,68 @@ public final class CraftServer implements Server {
1212
this.console.addPluginAllowingSleep(plugin.getName(), value);
1313
}
1414
// Paper end - API to check if the server is sleeping

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
22
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
3-
@@ -395,4 +_,17 @@
3+
@@ -396,4 +_,17 @@
44
}
55
}
66
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
//Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot unload a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes.
9292
if (world == null) {
9393
return false;
94-
@@ -3083,11 +_,27 @@
94+
@@ -3073,11 +_,27 @@
9595

9696
@Override
9797
public double[] getTPS() {
@@ -122,7 +122,7 @@
122122
}
123123

124124
// Paper start - adventure sounds
125-
@@ -3258,7 +_,7 @@
125+
@@ -3248,7 +_,7 @@
126126

127127
@Override
128128
public int getCurrentTick() {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group=dev.folia
22
version=1.21.4-R0.1-SNAPSHOT
33
mcVersion=1.21.4
44

5-
paperRef=5395ae37bd372235390d28292ed582d0c4fc23dd
5+
paperRef=cafef9ce9bb73cbcb9bc9c59eb982ae2516f5ee6
66

77
org.gradle.configuration-cache=true
88
org.gradle.caching=true

0 commit comments

Comments
 (0)