Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02: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@06fdc02 [ci skip] Correct upstream/paper javadoc (#8286)
PaperMC/Paper@11ab383 Don't use plugin-profiling to enable timings
This commit is contained in:
granny
2023-03-31 00:12:09 -07:00
parent 7cb1f466d1
commit bd5c4b67e6
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0038-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 731aaf6090d0ea6c5a4cc40e03067456a12ffb6f..9ea6210439d680d550b661783874e21cd92b6422 100644
index 29f98336de10e2af1ef15d0f0d29796076d008e1..83e1360397ec257719c0e1f8734d57daece76a0e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2483,5 +2483,24 @@ public final class Bukkit {
@@ -2480,5 +2480,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index 731aaf6090d0ea6c5a4cc40e03067456a12ffb6f..9ea6210439d680d550b661783874e21c
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ee0e26ffc49088011e06489684a2bfce486648ba..2b64836fcfd22c7b11030aca4de44784440e285b 100644
index d6f126d4f9f84c013b4c9320a38a66c6bab12d8c..b2184f33f8b34ae484357742690e205accaa635f 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2166,5 +2166,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2163,5 +2163,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();