Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-22 03:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2ec04e0 Use correct headerLocation for regionfile initialisation
PaperMC/Paper@f23c039 Fix infinite recursion in spawnCategoryForChunk/Position
PaperMC/Paper@9940bca API for creating command sender which forwards feedback (#7432)

Pufferfish Changes:
pufferfish-gg/Pufferfish@d549dda Improve vanilla parity of suffocation patch
pufferfish-gg/Pufferfish@17b3430 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@bcbaf3e Fix div by zero
This commit is contained in:
BillyGalbreath
2022-02-02 21:10:07 -06:00
parent 3f1ad9380d
commit d89923f642
13 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0043-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 4234d01ed793390ec3fb5fb69cf26102b92be020..91c1d04b77929438bb5c79d8829e14b161b4f2d9 100644
index a046ba83697ef7e3b9dd0034920a84912e0f5f0b..c6d9a42f02cb538ee3739cd01f0a22203c9ceb41 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2200,5 +2200,24 @@ public final class Bukkit {
@@ -2214,5 +2214,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index 4234d01ed793390ec3fb5fb69cf26102b92be020..91c1d04b77929438bb5c79d8829e14b1
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index fee029f0a4b5cbd2b5ab9315a53c03bd6bf0a290..2c4dfcf909c0214d25232a14635b96f92d4d974a 100644
index 3d9cbd6b37ee932f0b9908e4410107f5a123a551..1a38b9e616c6096d8d64c8abaa7178bc5f84e8d4 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1918,5 +1918,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1930,5 +1930,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();