WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 4ed5b66

Browse files
committed
Update Paper
1 parent 910562b commit 4ed5b66

File tree

8 files changed

+518
-516
lines changed

8 files changed

+518
-516
lines changed

folia-api/paper-patches/features/0003-Require-plugins-to-be-explicitly-marked-as-Folia-sup.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ more helpful than some random error log caused by
1414
a breakage.
1515

1616
diff --git a/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java b/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
17-
index 2114651bd68c5eddc6e2ab7304d48643ee4b8916..158edf843d389e279b0bfc0a80c78e1482e1d50f 100644
17+
index a399f87e925a72aac91b3066317c3efb61c0421a..0100108fd87268d225a60e51eaf87071b359ef6f 100644
1818
--- a/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
1919
+++ b/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
20-
@@ -180,4 +180,12 @@ public interface PluginMeta {
21-
*/
22-
@Nullable String getAPIVersion();
23-
20+
@@ -189,4 +189,12 @@ public interface PluginMeta extends Namespaced {
21+
default String namespace() {
22+
return this.getName().toLowerCase(Locale.ROOT);
23+
}
24+
+
2425
+ // Folia start - block plugins not marked as supported
2526
+ /**
2627
+ * Returns whether the plugin has been marked to be compatible with regionised threading as provided
2728
+ * by Folia
2829
+ */
2930
+ public boolean isFoliaSupported();
3031
+ // Folia end - block plugins not marked as supported
31-
+
3232
}
3333
diff --git a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
3434
index 0324ec640d4dd6b1f6287fc2ce9e8a0b3b87d5bf..de5d5399e7f9cf56439ada32f3cc7df3a2e95ef4 100644

folia-server/build.gradle.kts.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
implementation("ca.spottedleaf:concurrentutil:0.0.3")
5050
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
5151
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
52-
@@ -201,14 +_,14 @@
52+
@@ -200,14 +_,14 @@
5353
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
5454
attributes(
5555
"Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -68,7 +68,7 @@
6868
"Build-Number" to (build ?: ""),
6969
"Build-Time" to buildTime.toString(),
7070
"Git-Branch" to gitBranch,
71-
@@ -372,7 +_,7 @@
71+
@@ -371,7 +_,7 @@
7272
}
7373

7474
fill {

folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch

Lines changed: 71 additions & 71 deletions
Large diffs are not rendered by default.

folia-server/minecraft-patches/features/0007-Region-profiler.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,7 +1458,7 @@ index 4a7de2ed6eabe919f0c33de49ed7fab75abac1b4..7280ca2250ade4166a1a883b205bbc89
14581458
if (var4 instanceof ReportedException reportedException && reportedException.getCause() instanceof OutOfMemoryError) {
14591459
throw makeReportedException(var4, packet, processor);
14601460
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
1461-
index dd705c0d33412e4d77eb01d7b8502dd00de61334..15696729bcdde7526098328348ba6d566706149b 100644
1461+
index 5a8cbe318e9a6ad528f881cbfac213b1e9d67fda..0238bce5c050808798f092dc07a0206502704bc9 100644
14621462
--- a/net/minecraft/server/MinecraftServer.java
14631463
+++ b/net/minecraft/server/MinecraftServer.java
14641464
@@ -1580,6 +1580,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1860,18 +1860,18 @@ index cd6f937fa4eaba6033bfc230e3483b6b9e1ae607..5e3be75b27ed609be005e8169dc84c12
18601860
}
18611861

18621862
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
1863-
index 5ff771fecb927f614eb329c4cba69d0d8ae5f44e..f92e3e0300c7964451ca9e62e888bfd1986023bb 100644
1863+
index 60aa421884b532f693a5458b06f2ea74ba6f03ce..976a8982a0b0a9ae459cf08e13d69031d4238eca 100644
18641864
--- a/net/minecraft/server/players/PlayerList.java
18651865
+++ b/net/minecraft/server/players/PlayerList.java
1866-
@@ -1151,6 +1151,7 @@ public abstract class PlayerList {
1866+
@@ -1149,6 +1149,7 @@ public abstract class PlayerList {
18671867

18681868
public void saveAll(final int interval) {
18691869
io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
18701870
+ final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler(); // Folia - profiler
18711871
int numSaved = 0;
18721872
final long now = System.nanoTime(); // Folia - region threading
18731873
long timeInterval = (long)interval * io.papermc.paper.threadedregions.TickRegionScheduler.TIME_BETWEEN_TICKS; // Folia - region threading
1874-
@@ -1161,7 +1162,9 @@ public abstract class PlayerList {
1874+
@@ -1159,7 +1160,9 @@ public abstract class PlayerList {
18751875
}
18761876
// Folia end - region threading
18771877
if (interval == -1 || now - player.lastSave >= timeInterval) { // Folia - region threading
@@ -1926,7 +1926,7 @@ index cdf71340278e05e58bbb4ed51a432336de46e549..6f00ffa05d9597917574357e0069c9b0
19261926
}
19271927
}
19281928
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
1929-
index 1976a443e7c59e1e18d8a411513df39c83ad1095..5fe048ce442957a534d44454e0bb908afe8ad3a6 100644
1929+
index 2acf7bb76bd61c6c100ba48543d96ae0f08f9064..2049990edf0280d2b74b7284b32e78678a5ca6db 100644
19301930
--- a/net/minecraft/world/level/Level.java
19311931
+++ b/net/minecraft/world/level/Level.java
19321932
@@ -188,6 +188,9 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
@@ -2022,7 +2022,7 @@ index e8914d8c3c0e69d9e5ce97345eb9f24b05b4845f..e74ea44096e071878372c5b8889f45cd
20222022
profilerFiller.pop();
20232023
} catch (Throwable var5) {
20242024
diff --git a/net/minecraft/world/ticks/LevelTicks.java b/net/minecraft/world/ticks/LevelTicks.java
2025-
index 2caedf1c12e5a388f7b14989310a2137bc1117c3..07e0258e8c2c0c0788e76822e2477fb6f5bc4447 100644
2025+
index 58ec3956dcd04c26aad7863e34b3d6871f1821d6..19c45f60f4b13bc317f7d1639fb7873862c7947b 100644
20262026
--- a/net/minecraft/world/ticks/LevelTicks.java
20272027
+++ b/net/minecraft/world/ticks/LevelTicks.java
20282028
@@ -247,6 +247,12 @@ public class LevelTicks<T> implements LevelTickAccess<T> {

0 commit comments

Comments
 (0)