diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-08-14 19:26:34 +0900 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-08-14 19:34:44 +0900 |
| commit | 612dddf0b65be65a70783622c6406a966d935ebc (patch) | |
| tree | c14ca86eae0dadace3617681aad605da5b849b56 /default-plugin/src/main/java/me/shedaniel | |
| parent | d0a69811215c779229e9227264f5b79839c471af (diff) | |
| parent | 90af6e03bcf45b0c13d5b7af51126bd2fc7389a5 (diff) | |
| download | RoughlyEnoughItems-612dddf0b65be65a70783622c6406a966d935ebc.tar.gz RoughlyEnoughItems-612dddf0b65be65a70783622c6406a966d935ebc.tar.bz2 RoughlyEnoughItems-612dddf0b65be65a70783622c6406a966d935ebc.zip | |
Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21
Fixes #1665
Fixes #1662
Fixes #1663
Diffstat (limited to 'default-plugin/src/main/java/me/shedaniel')
| -rw-r--r-- | default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java index 0cb016597..a98ee1563 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java @@ -64,11 +64,8 @@ public class DefaultPlugin implements BuiltinPlugin, REIServerPlugin { @Override public void registerItemComparators(ItemComparatorRegistry registry) { Function<ItemStack, ItemEnchantments> enchantmentTag = stack -> { - if (!stack.has(DataComponents.ENCHANTMENTS)) { - if (stack.has(DataComponents.STORED_ENCHANTMENTS)) { - return stack.get(DataComponents.STORED_ENCHANTMENTS); - } - return null; + if (stack.has(DataComponents.STORED_ENCHANTMENTS)) { + return stack.get(DataComponents.STORED_ENCHANTMENTS); } return stack.get(DataComponents.ENCHANTMENTS); }; |