diff --git a/src/main/java/ch/njol/skript/bukkitutil/EnchantmentUtils.java b/src/main/java/ch/njol/skript/bukkitutil/EnchantmentUtils.java index fd47ded1319..68dec184a29 100644 --- a/src/main/java/ch/njol/skript/bukkitutil/EnchantmentUtils.java +++ b/src/main/java/ch/njol/skript/bukkitutil/EnchantmentUtils.java @@ -42,17 +42,16 @@ public class EnchantmentUtils { private static final Map NAMES = new HashMap<>(); private static final Map PATTERNS = new HashMap<>(); private static final boolean HAS_REGISTRY = Skript.classExists("org.bukkit.Registry") && Skript.fieldExists(Registry.class, "ENCHANTMENT"); + static { Language.addListener(() -> { NAMES.clear(); List enchantments = new ArrayList<>(); - if (HAS_REGISTRY) { + if (HAS_REGISTRY) Registry.ENCHANTMENT.forEach(enchantments::add); - } else { + else enchantments.addAll(Arrays.asList(Enchantment.values())); - } for (Enchantment enchantment : enchantments) { - assert enchantment != null; final String[] names = Language.getList("enchantments." + getKey(enchantment)); NAMES.put(enchantment, names[0]);