Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 02:08:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5b53cb4 [ci skip] use more jspecify in server
PaperMC/Paper@a63013c [ci skip] fix compile issues caused by 5b53cb4 (#11664)
PaperMC/Paper@cd9e697 Bump dawidd6/action-download-artifact from 3 to 6 in /.github/workflows (#11666)
PaperMC/Paper@280b497 Change MinecraftServer#pluginsBlockingSleep to be Set
PaperMC/Paper@4190ee7 Add Server#isGlobalTickThread
PaperMC/Paper@5f0932b [ci skip] leaf
This commit is contained in:
granny
2024-11-25 16:56:53 -08:00
parent 55d4309e5c
commit 0601f870d4
12 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0012-Bring-back-server-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 391a1e3e07657a404520c1462507a2c731f32b27..51a071668ff708cae93900ea09765f62a4fd8a07 100644
index 5ce98e09e9bfcae45896401c69578aa879222893..82c65e39d02b3bb63360d36df45f8ed7a0bc096b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2945,4 +2945,15 @@ public final class Bukkit {
@@ -2968,4 +2968,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index 391a1e3e07657a404520c1462507a2c731f32b27..51a071668ff708cae93900ea09765f62
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a3a0b9c974792d735ec235b01d831e2e1e4a6768..513b34f1043e74184da179f1a9d86880731d4c70 100644
index f1c121c150d2ab7ca2d080846a5f726920210662..715ca4c541fb3bc2f30c53c2f52025ac2e70cd3c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2600,4 +2600,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2619,4 +2619,13 @@ 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

8
patches/api/0014-Lagging-threshold.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 51a071668ff708cae93900ea09765f62a4fd8a07..76a86df9c0f9bfbd4f5d67e288c81994879592bc 100644
index 82c65e39d02b3bb63360d36df45f8ed7a0bc096b..30b4005b99a31de2c64d35432a751c00b3b335f6 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2955,5 +2955,14 @@ public final class Bukkit {
@@ -2978,5 +2978,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 51a071668ff708cae93900ea09765f62a4fd8a07..76a86df9c0f9bfbd4f5d67e288c81994
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 513b34f1043e74184da179f1a9d86880731d4c70..58d6a38a1a48b4dee428051718f185b962782e64 100644
index 715ca4c541fb3bc2f30c53c2f52025ac2e70cd3c..ca315417c7e60d50f48af07c53f6e7405fb88053 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2608,5 +2608,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2627,5 +2627,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();

8
patches/api/0032-Added-the-ability-to-add-combustible-items.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 76a86df9c0f9bfbd4f5d67e288c81994879592bc..1496957997198b64b9a55b5c882a4df633be71c6 100644
index 30b4005b99a31de2c64d35432a751c00b3b335f6..c4de1352f3f061e950d3fdc114b6542cf13a34ce 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2964,5 +2964,24 @@ public final class Bukkit {
@@ -2987,5 +2987,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index 76a86df9c0f9bfbd4f5d67e288c81994879592bc..1496957997198b64b9a55b5c882a4df6
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 58d6a38a1a48b4dee428051718f185b962782e64..65527ab58a7247408889f71c02ef40c2c183e0ed 100644
index ca315417c7e60d50f48af07c53f6e7405fb88053..30e52ca06cac23f35143767937ce474a8339018a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2615,5 +2615,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2634,5 +2634,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();

8
patches/api/0039-Debug-Marker-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 1496957997198b64b9a55b5c882a4df633be71c6..8f5fde63b195d08029305ee0172687df88ad0496 100644
index c4de1352f3f061e950d3fdc114b6542cf13a34ce..d42c463ff5e60318470e6c3270ff7bc6f0aaaeb1 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2983,5 +2983,89 @@ public final class Bukkit {
@@ -3006,5 +3006,89 @@ public final class Bukkit {
public static void removeFuel(@NotNull Material material) {
server.removeFuel(material);
}
@@ -99,10 +99,10 @@ index 1496957997198b64b9a55b5c882a4df633be71c6..8f5fde63b195d08029305ee0172687df
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 65527ab58a7247408889f71c02ef40c2c183e0ed..6328d4da00fedc1d59635254a95a2a76a4ef16a1 100644
index 30e52ca06cac23f35143767937ce474a8339018a..9a25dd2166892d612d32a4611a2531a3cee6754f 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2630,5 +2630,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2649,5 +2649,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @param material The material that will no longer be a fuel
*/
public void removeFuel(@NotNull Material material);