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:
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

6
patches/server/0211-Added-the-ability-to-add-combustible-items.patch
View File

@@ -51,10 +51,10 @@ index ca2052804ad829a1528a9c5a0a792275beead113..997d0fab71eacc6466ffe3bc8f6349e5
private int maxStack = MAX_STACK;
public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7afc14b00a38bd83f5ec6dc12bf86bc7ee6574a2..00fe4b406eaec3e1bc02cb9bb35530d9c98743b0 100644
index af64a42eba7b23e8a0f085d874a66dcbb060cb75..ac85de5112975097e20d319059deee42a3961fa2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1447,6 +1447,19 @@ public final class CraftServer implements Server {
@@ -1448,6 +1448,19 @@ public final class CraftServer implements Server {
return true;
}
@@ -73,4 +73,4 @@ index 7afc14b00a38bd83f5ec6dc12bf86bc7ee6574a2..00fe4b406eaec3e1bc02cb9bb35530d9
+
@Override
public List<Recipe> getRecipesFor(ItemStack result) {
Validate.notNull(result, "Result cannot be null");
Preconditions.checkArgument(result != null, "ItemStack cannot be null");