Skip to content

421 amulets will not deactivate its subtypes when not equipped 修复四合一护符在未装备时，使得子类型护符失效的问题 #3806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YocyCraft wants to merge 3 commits into
base: dev/1.21/1.6
Choose a base branch
from
+5 −1
Open

421 amulets will not deactivate its subtypes when not equipped 修复四合一护符在未装备时，使得子类型护符失效的问题 #3806

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a641e89
fix(amulet): 421 amulets will not deactivate its subtypes when not eq…
YocyCraft Jun 22, 2026
61903c5
chore(style): fix code style
YocyCraft Jun 22, 2026
fd15c44
chore(style): add comment
YocyCraft Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/dev/dubhe/anvilcraft/api/amulet/type/FourToOneAmuletType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dev.dubhe.anvilcraft.api.amulet.type;

import com.google.common.collect.Lists;
import dev.dubhe.anvilcraft.api.amulet.AmuletManager;
import dev.dubhe.anvilcraft.api.amulet.fromto.Effect;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.damagesource.DamageSource;
Expand Down Expand Up @@ -39,7 +40,10 @@ public boolean matches(ItemLike item) {
@Override
public void inventoryTick(ServerPlayer player, ItemStack amulet, boolean isEnabled) {
for (AmuletType type : this.types) {
type.inventoryTick(player, amulet, isEnabled);
// 在这里要考虑到四合一护符未装备，但某个子类型护符已装备的可能性
type.inventoryTick(player, amulet, isEnabled
|| AmuletManager.INSTANCE.getAmuletsFromInventory(player).entries().stream()
.anyMatch(entry -> entry.getKey().value().equals(type)));
}
}

Expand Down
Loading