Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37: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

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