Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47: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@ab7bc3f Remove javadoc that doesn't apply to Paper (#9206)
PaperMC/Paper@57fdc66 Undeprecate Server#getMap (#9185)
PaperMC/Paper@f8603a4 Avoid Lazy Initialization for Enum Fields (#9210)
PaperMC/Paper@5b66d33 Call EntityChangeBlockEvent for frogs egg (#9213)
PaperMC/Paper@4ba5aac More accurate isInOpenWater impl (#9194)
PaperMC/Paper@a61b484 Fix MC-224454 (#9195)
PaperMC/Paper@b681760 Fix note block sound property on player heads (#9158)
PaperMC/Paper@bcd8dc2 Use the spigot config for mangrove propagule / torchflower growth (#8597)
This commit is contained in:
granny
2023-05-16 13:12:04 -07:00
parent b84222981c
commit 3b02c0439a
11 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 29f98336de10e2af1ef15d0f0d29796076d008e1..83e1360397ec257719c0e1f8734d57daece76a0e 100644
index a2ee324d32c48fa9d71768f9b1cf7efcae02a01d..72e8e8ff651cf254e0fe3a8927272ea8da0f5f5a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2480,5 +2480,24 @@ public final class Bukkit {
@@ -2479,5 +2479,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index 29f98336de10e2af1ef15d0f0d29796076d008e1..83e1360397ec257719c0e1f8734d57da
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index d6f126d4f9f84c013b4c9320a38a66c6bab12d8c..b2184f33f8b34ae484357742690e205accaa635f 100644
index d16c5f0bd920291311ccf9870463aaaa98661578..8b53a9149f655870ebc1c912eeb9fecbcb4836b8 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2163,5 +2163,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2162,5 +2162,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();