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@9cab01e [ci skip] Update Gradle wrapper to 7.4
PaperMC/Paper@cdb893b Add mid-tick task execution to block ticking
PaperMC/Paper@854f3d3 Put world into worldlist before initing the world
PaperMC/Paper@db81163 Execute mid tick tasks during tile entity ticking
PaperMC/Paper@501834e Fix custom inventory holders (#6199)
PaperMC/Paper@04a337a Add some missing deprecations to the adventure patch (#7500)
PaperMC/Paper@b6dad9c Fix desync on teleporting entity on first tick (#7183)
PaperMC/Paper@2a55e35 Option to have default CustomSpawners in custom worlds (#7493)
PaperMC/Paper@bfa50ad Custom Potion Mixes (#6744)
This commit is contained in:
BillyGalbreath
2022-02-23 09:40:25 -06:00
parent 52228a11c1
commit 4afe68b005
28 changed files with 105 additions and 105 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 ae21cdd6ff22cca2a725670d9c0023d85154cb33..528e0efb7ff16a1810a6de65ad7ce13223c135f4 100644
index 3ef38fee9957243a4e52fefdb50a53b63a40f4a3..dfdcbcd79e750fefa90b7a7ca58490a1fa5e92e0 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2322,5 +2322,24 @@ public final class Bukkit {
@@ -2331,5 +2331,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index ae21cdd6ff22cca2a725670d9c0023d85154cb33..528e0efb7ff16a1810a6de65ad7ce132
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index be88a4af01680963b9edb205a390018128cb4d13..47439c4667e6af38b3cf10da7c99d9bbc9c0700c 100644
index c14f73492c99aeee0f85fc6d80763a05de3d72a6..97e26767b9143e290fb232013090a91bb67bca7c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2026,5 +2026,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2033,5 +2033,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();