Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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@156675c Fix lodestone compass target conversion
PaperMC/Paper@5632210 add RegistryAccess for managing registries (#10154)
PaperMC/Paper@6fcca46 Add missing step in V3818
This commit is contained in:
granny
2024-05-04 20:12:36 -07:00
parent 7a63a45588
commit 44858f54ef
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.6-R0.1-SNAPSHOT version = 1.20.6-R0.1-SNAPSHOT
mcVersion = 1.20.6 mcVersion = 1.20.6
paperCommit = 0db72ac19e735d398e85b2152d5a32317bb03dc8 paperCommit = 6fcca46674f7ebbc261bd63339fbdcba21ab5133
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

4
patches/api/0001-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 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 27084402cf0e46dcd171074629b7c4156e48aa44..c0d6b38c2676f33698099a439f2c8754155e0030 100644 index 30cbe3bdc7142769019765b03cc4fe1f9ba1ddb4..f5c3c1a0c11dd3518981ce3b86dba8ced8578d9c 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/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 @@ -2257,6 +2257,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
} }
// Paper end // Paper end

8
patches/api/0009-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 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 687bd8f54c9bfb5f5ab1f7ad9d232daf2433cc76..8b6bc7028414cf005e9de8686a009e6b1f5ce0ec 100644 index 5d1b55fdbcbe63f6b42b694d05211a3cc691a09d..54f11593f4acfb89623cf1fad58819e001505fd1 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2907,4 +2907,15 @@ public final class Bukkit { @@ -2910,4 +2910,15 @@ public final class Bukkit {
public static Server.Spigot spigot() { public static Server.Spigot spigot() {
return server.spigot(); return server.spigot();
} }
@@ -25,10 +25,10 @@ index 687bd8f54c9bfb5f5ab1f7ad9d232daf2433cc76..8b6bc7028414cf005e9de8686a009e6b
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c0d6b38c2676f33698099a439f2c8754155e0030..4fbd136bc4a352ba26f1e65fd5fa2f58247c33f8 100644 index f5c3c1a0c11dd3518981ce3b86dba8ced8578d9c..1299cab5a4a0a017e0a1b792539d9b6fb8ef6c54 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -2549,4 +2549,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -2552,4 +2552,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/ */
boolean isOwnedByCurrentRegion(@NotNull Entity entity); boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API // Paper end - Folia region threading API

8
patches/api/0011-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 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 8b6bc7028414cf005e9de8686a009e6b1f5ce0ec..d0776d18cbfd0d2099b6107c395251adb4b24b94 100644 index 54f11593f4acfb89623cf1fad58819e001505fd1..215647d7f5cc8487d6a173bc0160fec6db1971eb 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2917,5 +2917,14 @@ public final class Bukkit { @@ -2920,5 +2920,14 @@ public final class Bukkit {
public static String getServerName() { public static String getServerName() {
return server.getServerName(); return server.getServerName();
} }
@@ -24,10 +24,10 @@ index 8b6bc7028414cf005e9de8686a009e6b1f5ce0ec..d0776d18cbfd0d2099b6107c395251ad
// Purpur end // Purpur end
} }
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 4fbd136bc4a352ba26f1e65fd5fa2f58247c33f8..f90401f03566dce125b470a559d4ac7837f44f22 100644 index 1299cab5a4a0a017e0a1b792539d9b6fb8ef6c54..7f9dc209c88a66bd2ee82cc62b948e827c6b1060 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -2557,5 +2557,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -2560,5 +2560,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/ */
@NotNull @NotNull
String getServerName(); String getServerName();

8
patches/api/0030-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 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index d0776d18cbfd0d2099b6107c395251adb4b24b94..1a8026b34415602f8c5304355816e0a506cac99d 100644 index 215647d7f5cc8487d6a173bc0160fec6db1971eb..7bc4e5e9947ab646707a5c0b39c70c0cc6606bd8 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2926,5 +2926,24 @@ public final class Bukkit { @@ -2929,5 +2929,24 @@ public final class Bukkit {
public static boolean isLagging() { public static boolean isLagging() {
return server.isLagging(); return server.isLagging();
} }
@@ -34,10 +34,10 @@ index d0776d18cbfd0d2099b6107c395251adb4b24b94..1a8026b34415602f8c5304355816e0a5
// Purpur end // Purpur end
} }
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index f90401f03566dce125b470a559d4ac7837f44f22..6f5a7029e4e048b6a68f856c35545101f11387ed 100644 index 7f9dc209c88a66bd2ee82cc62b948e827c6b1060..fa926319ff033768d78508491e072efec1dcbc9f 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -2564,5 +2564,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -2567,5 +2567,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging * @return True if lagging
*/ */
boolean isLagging(); boolean isLagging();

8
patches/api/0037-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 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 1a8026b34415602f8c5304355816e0a506cac99d..60de2456d00e85ac5ec5c4549198429aea87bc6d 100644 index 7bc4e5e9947ab646707a5c0b39c70c0cc6606bd8..70ef8f63ab79e102cb4326c21cc344488f4fbdd3 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2945,5 +2945,89 @@ public final class Bukkit { @@ -2948,5 +2948,89 @@ public final class Bukkit {
public static void removeFuel(@NotNull Material material) { public static void removeFuel(@NotNull Material material) {
server.removeFuel(material); server.removeFuel(material);
} }
@@ -99,10 +99,10 @@ index 1a8026b34415602f8c5304355816e0a506cac99d..60de2456d00e85ac5ec5c4549198429a
// Purpur end // Purpur end
} }
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6f5a7029e4e048b6a68f856c35545101f11387ed..a15d0ed710ff261f203d7e355e7d532f2e68abc9 100644 index fa926319ff033768d78508491e072efec1dcbc9f..320422ff95773efa01e8205edcc5c6c9a84d5ecd 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -2579,5 +2579,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -2582,5 +2582,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @param material The material that will no longer be a fuel * @param material The material that will no longer be a fuel
*/ */
public void removeFuel(@NotNull Material material); public void removeFuel(@NotNull Material material);