mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[Auto] Updated Upstream (Bukkit/CraftBukkit)

Browse source 
Upstream has released updates that appear 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:
9477fa26 #597: Implemented Material#getEquipmentSlot() method

CraftBukkit Changes:
35124087d #819: Implemented test for Material#getEquipmentSlot() method
This commit is contained in:
Aikar 2021-04-13 05:27:34 -04:00
parent 8756d232c6
commit 8a29f58942
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Spigot-API-Patches/0153-Material-API-additions.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Material API additions
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 27adc7afae3d32c36762b9355cb5210e187df795..2e959d195f7a5e723952e421aeaeeb463f07d3f5 100644
index e4d0dc26fb2f2c4435e11b3460d8c93d6a6fc47f..2b53e68e96ea346a6f2b5cadcf9f81b2c231c408 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -86,6 +86,7 @@ import org.jetbrains.annotations.Nullable;
@@ -87,6 +87,7 @@ import org.jetbrains.annotations.Nullable;
/**
* An enum of all material IDs accepted by the official server and client
*/
@ -16,7 +16,7 @@ index 27adc7afae3d32c36762b9355cb5210e187df795..2e959d195f7a5e723952e421aeaeeb46
public enum Material implements Keyed {
//<editor-fold desc="Materials" defaultstate="collapsed">
AIR(9648, 0),
@@ -3562,6 +3563,22 @@ public enum Material implements Keyed {
@@ -3563,6 +3564,22 @@ public enum Material implements Keyed {
}
}