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:
4276013833 Updated Upstream (Bukkit/CraftBukkit/Spigot)
5344798579 Clean plugin folder logic in extra-jars patch (Fixes #6347) (#6619)
3f2159e43c Unlimited chunk load rate (#6768)
fc0e6c7e08 Fix off by one for determining server view distance
0a16fb8182 Fix merchant inventories not closing on entity removal (#6544)
c1644521c9 Do not overload I/O threads with chunk data while flush saving
This commit is contained in:
William Blake Galbreath
2021-10-16 12:56:31 -05:00
parent e876536ae9
commit db65efba2b
13 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0049-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 f4e35cd1a398cc07842c359ec560eed4596732b4..6197605519abf3c59108f1dff34105cc2bca10c2 100644
index 5d20d91f44a9f0f94183eaea300d1033f292a28e..2e86aa13913553306512232a72497ec6b003260c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2123,5 +2123,24 @@ public final class Bukkit {
@@ -2137,5 +2137,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index f4e35cd1a398cc07842c359ec560eed4596732b4..6197605519abf3c59108f1dff34105cc
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e89d80128b2944efb7e105b92f8f825afe80affb..c44212baa2cc167a1a818c158441e5ff749f29eb 100644
index 4d15d4b5b23d38599ab227dc1c2a9c25a077e531..ccfb8a8dcd51bf998c79298a22e38cebb2be6d39 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1855,5 +1855,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1867,5 +1867,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();