Skip to content

Commit 5b5e45a

Browse files
committed
Update Paper
1 parent 8b9ddf1 commit 5b5e45a

File tree

8 files changed

+68
-68
lines changed

8 files changed

+68
-68
lines changed

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 1635250e7df04b91f5a0ac6442bf5fa46157bf03..bb1a8220174a2882c7056733536f57586044dc75 100644
8+
index d1d7f1fe4fa20355af40e5d77d2c3fa55bdd0ecd..acff6136c321fd1b097c9888bce6195571663d75 100644
99
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1010
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
11-
@@ -3339,4 +3339,68 @@ public final class CraftServer implements Server {
11+
@@ -3345,4 +3345,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-
@@ -396,4 +_,17 @@
3+
@@ -398,4 +_,17 @@
44
}
55
}
66
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
22
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
3-
@@ -316,7 +_,7 @@
3+
@@ -317,7 +_,7 @@
44
public final io.papermc.paper.SparksFly spark; // Paper - spark
55

66
// Paper start - Folia region threading API
@@ -9,7 +9,7 @@
99
private final io.papermc.paper.threadedregions.scheduler.FoliaAsyncScheduler asyncScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaAsyncScheduler();
1010
private final io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler globalRegionScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler();
1111

12-
@@ -393,7 +_,7 @@
12+
@@ -394,7 +_,7 @@
1313

1414
@Override
1515
public final boolean isGlobalTickThread() {
@@ -18,7 +18,7 @@
1818
}
1919
// Paper end - Folia reagion threading API
2020

21-
@@ -988,6 +_,9 @@
21+
@@ -989,6 +_,9 @@
2222

2323
// NOTE: Should only be called from DedicatedServer.ah()
2424
public boolean dispatchServerCommand(CommandSender sender, ConsoleInput serverCommand) {
@@ -28,7 +28,7 @@
2828
if (sender instanceof Conversable) {
2929
Conversable conversable = (Conversable) sender;
3030

31-
@@ -1007,12 +_,46 @@
31+
@@ -1008,12 +_,46 @@
3232
}
3333
}
3434

@@ -75,23 +75,23 @@
7575
if (this.commandMap.dispatch(sender, commandLine)) {
7676
return true;
7777
}
78-
@@ -1284,6 +_,7 @@
78+
@@ -1285,6 +_,7 @@
7979

8080
@Override
8181
public World createWorld(WorldCreator creator) {
8282
+ if (true) throw new UnsupportedOperationException(); // Folia - not implemented properly yet
8383
Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP");
8484
//Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot create a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes.
8585
Preconditions.checkArgument(creator != null, "WorldCreator cannot be null");
86-
@@ -1481,6 +_,7 @@
86+
@@ -1482,6 +_,7 @@
8787

8888
@Override
8989
public boolean unloadWorld(World world, boolean save) {
9090
+ if (true) throw new UnsupportedOperationException(); // Folia - not implemented properly yet
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-
@@ -3073,11 +_,27 @@
94+
@@ -3079,11 +_,27 @@
9595

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

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

127127
@Override
128128
public int getCurrentTick() {

0 commit comments

Comments
 (0)