Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01: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@8fd3a67 [ci skip] Clean up book limits patch (#11297)
PaperMC/Paper@dae906b Add getWorld method that uses adventure Key (#11199)
PaperMC/Paper@ba1b016 Allow server administrators to disable book size checks (#10457)
PaperMC/Paper@a8cb8e6 [ci skip] Fix JavaDocs for HeightMap#MOTION_BLOCKING_NO_LEAVES (#11291)
PaperMC/Paper@e4b38b4 Fixup config parsing
This commit is contained in:
granny
2024-08-19 12:14:20 -07:00
parent c4a6f63dd1
commit 568a028f8c
15 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0004-Purpur-config-files.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c043d239c449bf4bb13a24467f2f6c67b4d28d2d..c0911b100176f1a797a336a35a374c05a4769a2c 100644
index 5aa64ea39ebd92e5067c53cea49a8685c0b9eee4..a11121ce2da22c7ebb8d8b9c9fef75f19af99c2d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2254,6 +2254,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2265,6 +2265,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Paper end

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 4705c1d91e39fcc3c608b1f1a38a30d063ccf06e..bd5147f2c1afd8de5a4be18688e2e95f8719ec7e 100644
index 419c056faf0d49d9b0435feb01252e87e227b9a9..a07607d6b7b6e58b5a4176759cb6dbb6988267de 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2910,4 +2910,15 @@ public final class Bukkit {
@@ -2921,4 +2921,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index 4705c1d91e39fcc3c608b1f1a38a30d063ccf06e..bd5147f2c1afd8de5a4be18688e2e95f
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c0911b100176f1a797a336a35a374c05a4769a2c..f78b65dff2246c13d653296f2fda76848579081d 100644
index a11121ce2da22c7ebb8d8b9c9fef75f19af99c2d..9f1e3815f348d16a79f590515b3ed5c47e31cad2 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2555,4 +2555,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2566,4 +2566,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API

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 bd5147f2c1afd8de5a4be18688e2e95f8719ec7e..2bdd85284ae4c10fe26594be85aa9d8aa699b84f 100644
index a07607d6b7b6e58b5a4176759cb6dbb6988267de..8f3462f3242ec9f583a5d7a297fdd9c6f43cfc31 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2920,5 +2920,14 @@ public final class Bukkit {
@@ -2931,5 +2931,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index bd5147f2c1afd8de5a4be18688e2e95f8719ec7e..2bdd85284ae4c10fe26594be85aa9d8a
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index f78b65dff2246c13d653296f2fda76848579081d..988d00a4ad9330e338240db6b0bbe2b5157b342c 100644
index 9f1e3815f348d16a79f590515b3ed5c47e31cad2..766b4908ba5057bcda566f8a8cf1914416ede910 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2563,5 +2563,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2574,5 +2574,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 2bdd85284ae4c10fe26594be85aa9d8aa699b84f..5fd070d4839e5b91cafeefdb9316e3bba102e5be 100644
index 8f3462f3242ec9f583a5d7a297fdd9c6f43cfc31..1ce82760b0b254abf9e2994883694794502ad93b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2929,5 +2929,24 @@ public final class Bukkit {
@@ -2940,5 +2940,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index 2bdd85284ae4c10fe26594be85aa9d8aa699b84f..5fd070d4839e5b91cafeefdb9316e3bb
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 988d00a4ad9330e338240db6b0bbe2b5157b342c..1724bedbcdc67bfcc2d2d2be6b805901be5df169 100644
index 766b4908ba5057bcda566f8a8cf1914416ede910..779dc2556f4d3b2cd46d8926636f7a5b0cf1a744 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2570,5 +2570,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2581,5 +2581,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 5fd070d4839e5b91cafeefdb9316e3bba102e5be..4a870c63cf240c4fa89534bf3ec1b06393efb967 100644
index 1ce82760b0b254abf9e2994883694794502ad93b..4cd159133d6dc3a6ec1b822e8625920f3919931e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2948,5 +2948,89 @@ public final class Bukkit {
@@ -2959,5 +2959,89 @@ public final class Bukkit {
public static void removeFuel(@NotNull Material material) {
server.removeFuel(material);
}
@@ -99,10 +99,10 @@ index 5fd070d4839e5b91cafeefdb9316e3bba102e5be..4a870c63cf240c4fa89534bf3ec1b063
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 1724bedbcdc67bfcc2d2d2be6b805901be5df169..1d594c256200d46882fafce5d2b33e60f0fa3a59 100644
index 779dc2556f4d3b2cd46d8926636f7a5b0cf1a744..84b07a7fd7941b2f75b531646b67a124a0607390 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2585,5 +2585,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2596,5 +2596,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);