Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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@d332623 Avoid potential place where the world map could be modified after its iterator is created (#8315)
PaperMC/Paper@6736f39 Fix mangled patch
PaperMC/Paper@4d52f1d Add method isTickingWorlds to Bukkit (#8316)
PaperMC/Paper@62680d5 Avoid item meta usage for itemstack enchantment getter (#8373)
PaperMC/Paper@b4c025b Fix player desync on dimension change (#8253)
This commit is contained in:
BillyGalbreath
2022-09-24 08:04:00 -05:00
parent 103965b5b4
commit ec75e5964a
28 changed files with 99 additions and 99 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 da5cab4246bd253fcc4e4d9574bdae1867ebb5ab..acca0fea7037232bbc95c4c945b1621db3026feb 100644
index 1982fc2d7f1cb80d3e324ee283211b251a976c6e..61590b93f07b8b197b5ea69423e9cfb7a149c0e6 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1948,6 +1948,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1969,6 +1969,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Paper end

8
patches/api/0011-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 840aaf9e8fc828b5a7ea02252038c6524680f2e0..5110ff0ffb2f4a42a0f5a11117d18c445e3c9711 100644
index b5a7d6ab4e458843f2e163bf06b5668627012f91..d76cfd8fbc96a592f79d2ffaf838268b2aade1b2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2442,4 +2442,15 @@ public final class Bukkit {
@@ -2462,4 +2462,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index 840aaf9e8fc828b5a7ea02252038c6524680f2e0..5110ff0ffb2f4a42a0f5a11117d18c44
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index acca0fea7037232bbc95c4c945b1621db3026feb..046380115fb3f94d78a420c5197dc89a3a813140 100644
index 61590b93f07b8b197b5ea69423e9cfb7a149c0e6..025503596d9febf8d76c82b4fe940e8661de9dce 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2128,4 +2128,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2149,4 +2149,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
// Paper end

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 5110ff0ffb2f4a42a0f5a11117d18c445e3c9711..e55a927e3171cf7f7dbd328790cc522b3b4eb08a 100644
index d76cfd8fbc96a592f79d2ffaf838268b2aade1b2..b507eb5bccf3689cc28a7bce7f4e31114b52a342 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2452,5 +2452,14 @@ public final class Bukkit {
@@ -2472,5 +2472,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 5110ff0ffb2f4a42a0f5a11117d18c445e3c9711..e55a927e3171cf7f7dbd328790cc522b
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 046380115fb3f94d78a420c5197dc89a3a813140..d69a29109b5c991474ff7d59c02bf9a37aa7002f 100644
index 025503596d9febf8d76c82b4fe940e8661de9dce..6843701a22af21d0610bfa1c0eb85f8b0fed82df 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2136,5 +2136,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2157,5 +2157,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();

8
patches/api/0041-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 e55a927e3171cf7f7dbd328790cc522b3b4eb08a..f2fc1042bcd1a98b97e8af3fbb7133f0963321f2 100644
index b507eb5bccf3689cc28a7bce7f4e31114b52a342..581c797b660cd190dc368a4d3f1c01717e98a4a6 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2461,5 +2461,24 @@ public final class Bukkit {
@@ -2481,5 +2481,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index e55a927e3171cf7f7dbd328790cc522b3b4eb08a..f2fc1042bcd1a98b97e8af3fbb7133f0
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index d69a29109b5c991474ff7d59c02bf9a37aa7002f..032ed217706fd27beb4d8247b77e5b7c0381bd04 100644
index 6843701a22af21d0610bfa1c0eb85f8b0fed82df..7b499d4501e2123b22fd8311c68b8f7b3c41beed 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2143,5 +2143,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2164,5 +2164,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();

8
patches/api/0050-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 f2fc1042bcd1a98b97e8af3fbb7133f0963321f2..a3e22c90f856ad215bab4e0f308e46cd4c4b06db 100644
index 581c797b660cd190dc368a4d3f1c01717e98a4a6..827ff8d71391a7e7b4273c85fe3b6601dab68f77 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2480,5 +2480,89 @@ public final class Bukkit {
@@ -2500,5 +2500,89 @@ public final class Bukkit {
public static void removeFuel(@NotNull Material material) {
server.removeFuel(material);
}
@@ -99,10 +99,10 @@ index f2fc1042bcd1a98b97e8af3fbb7133f0963321f2..a3e22c90f856ad215bab4e0f308e46cd
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 032ed217706fd27beb4d8247b77e5b7c0381bd04..fea1283dcbac2794402bcd97f072ad3f84fcced1 100644
index 7b499d4501e2123b22fd8311c68b8f7b3c41beed..0e4d5345a5590d1a5d98cf11eb6e3649303c3ebb 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2158,5 +2158,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2179,5 +2179,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);