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 & Pufferfish)

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

Paper Changes:
PaperMC/Paper@7045f18 Change link to screamingsandals
PaperMC/Paper@ca62386 Hide ores with deepslate at Y=4 and below (#7792)
PaperMC/Paper@9b492cf Deprecate set/doesBounce from Projectile (#7800)
PaperMC/Paper@ed4e916 [ci-skip] Update repository and API urls (#7835)
PaperMC/Paper@fc1752f Fix more upstream javadocs (#7837)

Pufferfish Changes:
pufferfish-gg/Pufferfish@629b5b3 Updated Upstream (Paper)
This commit is contained in:
granny
2022-05-21 03:26:59 -07:00
parent 0939ddedab
commit 5f07aff44c
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0042-Added-the-ability-to-add-combustible-items.patch
View File

@@ -34,10 +34,10 @@ index 9189ada0644a226038eeb7967d45c72ddfc89085..8c37680ca16adbf030cfd3098330d259
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 41fdb8e58fdf9a9153fc671d1aab45e8b8b1f8bc..ccb8909d3da0bb6ccc6d35e8497c3b4b993b9044 100644
index 226dd08c1001c664d60f45a6d9370077f4b8c574..5d1668c6f368843ec071df7d65dbd0a29be545d0 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2085,5 +2085,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2082,5 +2082,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();