[Auto] Updated Upstream (Bukkit/CraftBukkit)

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
6 changed files with 13 additions and 13 deletions

View File

@@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202
+ }
+}
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 7b77c7132723a01e8c38ddaa616b363be300b653..0a31a5321ac519568db936c94394f71b2e2fcec1 100644
index 112c3f035ec7e7a7cae939264e0af4c6f4450abd..9b1c9e60dba9ea3ef8d8e164f13dd76daf57db8e 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -3588,6 +3588,17 @@ public enum Material implements Keyed {
@@ -3589,6 +3589,17 @@ public enum Material implements Keyed {
public String getTranslationKey() {
return Bukkit.getUnsafe().getTranslationKey(this);
}