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@e6f8284 Updated Upstream (Bukkit/CraftBukkit) (#8270)
This commit is contained in:
BillyGalbreath
2022-08-09 08:39:25 -05:00
parent d7b3ae90ce
commit b1925ac31f
18 changed files with 56 additions and 79 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 9b9af189b3865055570ba533b97c92c105cc5a37..ef478e1d21e9b134641faa5060152125d5c5ea13 100644
index f2fc1042bcd1a98b97e8af3fbb7133f0963321f2..a3e22c90f856ad215bab4e0f308e46cd4c4b06db 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2467,5 +2467,89 @@ public final class Bukkit {
@@ -2480,5 +2480,89 @@ public final class Bukkit {
public static void removeFuel(@NotNull Material material) {
server.removeFuel(material);
}
@@ -99,10 +99,10 @@ index 9b9af189b3865055570ba533b97c92c105cc5a37..ef478e1d21e9b134641faa5060152125
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index d73b7d72d00fa0edd6542226348af14c5203cf8d..b894ae05e566737680a444417c738c5aa8fc2450 100644
index 032ed217706fd27beb4d8247b77e5b7c0381bd04..fea1283dcbac2794402bcd97f072ad3f84fcced1 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2147,5 +2147,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2158,5 +2158,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);