magic-server/L2Core
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
lcy0x1
2024-09-27 14:14:09 +08:00
parent b60e4492cf
commit 294fadb7b5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/dev/xkmc/l2core/init/reg/ench/EnchVal.java
View File

@@ -35,16 +35,20 @@ public interface EnchVal {
@DataGenOnly @DataGenOnly
Holder<Enchantment> datagenDirect(RegistrateProvider pvd); Holder<Enchantment> datagenDirect(RegistrateProvider pvd);
default Optional<Holder<Enchantment>> safeHolder() {
return Optional.ofNullable(CommonHooks.resolveLookup(Registries.ENCHANTMENT)).flatMap(e -> e.get(id()));
}
default Holder<Enchantment> holder() { default Holder<Enchantment> holder() {
return Optional.ofNullable(CommonHooks.resolveLookup(Registries.ENCHANTMENT)).orElseThrow().getOrThrow(id()); return safeHolder().orElseThrow();
} }
default int getLv(ItemStack stack) { default int getLv(ItemStack stack) {
return stack.getEnchantmentLevel(holder()); return safeHolder().map(stack::getEnchantmentLevel).orElse(0);
} }
default int getLvIntrinsic(ItemStack stack) { default int getLvIntrinsic(ItemStack stack) {
return stack.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY).getLevel(holder()); return safeHolder().map(e -> stack.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY).getLevel(e)).orElse(0);
} }
interface Impl extends EnchVal { interface Impl extends EnchVal {