OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

[Auto] Updated Upstream (Bukkit/CraftBukkit)

Browse source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
1cb03826 SPIGOT-5900: Re-order Material enum entries to match Minecraft's order
fdd705db #507: Add hasDiscoveredRecipe() and getDiscoveredRecipes()

CraftBukkit Changes:
551e770f5 SPIGOT-5900: Add test for the order of Material enum entries
8297676c2 #682: Add hasDiscoveredRecipe() and getDiscoveredRecipes()
This commit is contained in:
Automated 2020-07-01 19:41:58 -04:00
parent 0f6675fffa
commit 20bdc049da
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Spigot-API-Patches/Material-API-additions.patch
View file

@ -15,7 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+@SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
public enum Material implements Keyed {
//<editor-fold desc="Materials" defaultstate="collapsed">
ACACIA_BOAT(27326, 1),
AIR(9648, 0),
@@ -0,0 +0,0 @@ public enum Material implements Keyed {
}
}

2
work/Bukkit

@ -1 +1 @@
Subproject commit 6ff65c824ad8dc9ba9228999800a0d7010904893
Subproject commit 1cb03826ebde4ef887519ce37b0a2a341494a183

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit d9bd43b060322ad72af3008669878ee5d6cc2cc0
Subproject commit 551e770f5f981053885e2e1a043b4ecb54a80aef