Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-12 10:31:37 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-5516: Correct EnchantmentTarget values

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot 2020-01-15 14:15:29 +11:00
parent e5ce128c45
commit b9ce15ca0c
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
paper-api/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
View File

@ -14,7 +14,13 @@ public enum EnchantmentTarget {
ALL { ALL {
@Override @Override
public boolean includes(@NotNull Material item) { public boolean includes(@NotNull Material item) {
return true; for (EnchantmentTarget target : EnchantmentTarget.values()) {
if (target != this && target.includes(item)) {
return true;
}
}
return false;
} }
}, },
@ -83,7 +89,8 @@ public enum EnchantmentTarget {
|| item.equals(Material.CHAINMAIL_HELMET) || item.equals(Material.CHAINMAIL_HELMET)
|| item.equals(Material.DIAMOND_HELMET) || item.equals(Material.DIAMOND_HELMET)
|| item.equals(Material.IRON_HELMET) || item.equals(Material.IRON_HELMET)
|| item.equals(Material.GOLDEN_HELMET); || item.equals(Material.GOLDEN_HELMET)
|| item.equals(Material.TURTLE_HELMET);
} }
}, },
@ -102,8 +109,7 @@ public enum EnchantmentTarget {
}, },
/** /**
* Allows the Enchantment to be placed on tools (spades, pickaxe, hoes, * Allows the Enchantment to be placed on tools (spades, pickaxe, axes)
* axes)
*/ */
TOOL { TOOL {
@Override @Override
@ -118,18 +124,11 @@ public enum EnchantmentTarget {
|| item.equals(Material.IRON_PICKAXE) || item.equals(Material.IRON_PICKAXE)
|| item.equals(Material.DIAMOND_PICKAXE) || item.equals(Material.DIAMOND_PICKAXE)
|| item.equals(Material.GOLDEN_PICKAXE) || item.equals(Material.GOLDEN_PICKAXE)
|| item.equals(Material.WOODEN_HOE)
|| item.equals(Material.STONE_HOE)
|| item.equals(Material.IRON_HOE)
|| item.equals(Material.DIAMOND_HOE)
|| item.equals(Material.GOLDEN_HOE)
|| item.equals(Material.WOODEN_AXE) || item.equals(Material.WOODEN_AXE)
|| item.equals(Material.STONE_AXE) || item.equals(Material.STONE_AXE)
|| item.equals(Material.IRON_AXE) || item.equals(Material.IRON_AXE)
|| item.equals(Material.DIAMOND_AXE) || item.equals(Material.DIAMOND_AXE)
|| item.equals(Material.GOLDEN_AXE) || item.equals(Material.GOLDEN_AXE);
|| item.equals(Material.SHEARS)
|| item.equals(Material.FLINT_AND_STEEL);
} }
}, },
@ -171,7 +170,6 @@ public enum EnchantmentTarget {
public boolean includes(@NotNull Material item) { public boolean includes(@NotNull Material item) {
return ARMOR.includes(item) return ARMOR.includes(item)
|| item.equals(Material.ELYTRA) || item.equals(Material.ELYTRA)
|| item.equals(Material.PUMPKIN)
|| item.equals(Material.CARVED_PUMPKIN) || item.equals(Material.CARVED_PUMPKIN)
|| item.equals(Material.JACK_O_LANTERN) || item.equals(Material.JACK_O_LANTERN)
|| item.equals(Material.SKELETON_SKULL) || item.equals(Material.SKELETON_SKULL)