Skip to content

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b58063a Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8124)
  • Loading branch information
BillyGalbreath committed Jul 12, 2022
1 parent 2b07212 commit 4044790
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT

paperCommit = e29480297798ed8bb5deff95bdb20f1b2594713c
paperCommit = b58063a9492bdcee9601e76ae6d3eca1452f2824

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
4 changes: 2 additions & 2 deletions patches/api/0019-ItemStack-convenience-methods.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods


diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 2d39ecea67cd033858eaa713e405260a87c718a3..b20b3d54342a8c81d1ff4062028c7b7d2eec4fe5 100644
index 1d6baee05643607baa40a07022576906ea61a92f..5da8af8e11dfa741aea4c167c4cb5e63dbdf5e70 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -10219,4 +10219,39 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
@@ -10221,4 +10221,39 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
return Bukkit.getUnsafe().getCreativeCategory(this);
}

Expand Down

0 comments on commit 4044790

Please sign in to comment.