Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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@eb0693f Fix EntityDeathEvent cancellation (#9323)
PaperMC/Paper@f8cfdd4 Fix SmithingInventory helper slot methods for 1.20 (#9325)
PaperMC/Paper@de19eb8 fix incorrectly updated move vector checking patch (#9328)
PaperMC/Paper@87dfff4 Implement BossBarViewer on Player (#9332)
PaperMC/Paper@2d09115 Use net.kyori.ansi for console logging (#9313)
PaperMC/Paper@b48e2e3 Fix dev bundle generation
PaperMC/Paper@c287e92 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9301)
PaperMC/Paper@2e363c7 1.20.1 (#9333)
This commit is contained in:
Ben Kerllenevich
2023-06-13 13:40:15 -04:00
parent 788c14f02c
commit cc465d63cd
103 changed files with 302 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0035-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 e71744ac7b773cc9cd46fd82566782f7d204f5d6..a4ecff25f1e43cc000751e41c73732d1130ded26 100644
index a522ff41b59b8c929d85736318f838f72873dfd9..ad74599b144d0516eef8baccea3318e5d12913e7 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2502,5 +2502,24 @@ public final class Bukkit {
@@ -2519,5 +2519,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index e71744ac7b773cc9cd46fd82566782f7d204f5d6..a4ecff25f1e43cc000751e41c73732d1
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index d547a53c55b446b8c3389695123009f8a1d91192..6082415b34fbaa49693e13c9605560f6495549c3 100644
index 47d885c63af0339beb2e978ff2c1d91a19c70846..4e9305099595c251f5d432c415fe3b60d9335eff 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2189,5 +2189,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2202,5 +2202,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();