CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

EnchantUtils do not get enchant by null key

Browse Source
This commit is contained in:
Alexander
2021-05-27 15:12:57 +01:00
parent 8c7ff2670f
commit 0cd47dc067
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/EnchantUtils.java
View File

@@ -140,9 +140,13 @@ public final class EnchantUtils {
if (Strings.isNullOrEmpty(value)) {
return null;
}
Enchantment enchantment = Enchantment.getByKey(KeyedUtils.fromString(value));
if (enchantment != null) {
return enchantment;
Enchantment enchantment;
final var enchantmentKey = KeyedUtils.fromString(value);
if (enchantmentKey != null) {
enchantment = Enchantment.getByKey(enchantmentKey);
if (enchantment != null) {
return enchantment;
}
}
enchantment = Enchantment.getByName(value.toUpperCase()); // deprecated
if (enchantment != null) {