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@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

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);