Skip to content

Commit fa9f215

Browse files
committed
fix: Port is_wearing_any_armor and has_item conditions
1 parent 60e8589 commit fa9f215

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

common/src/main/java/net/blay09/mods/waystones/requirement/RequirementRegistry.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
import net.minecraft.core.registries.Registries;
1515
import net.minecraft.network.chat.Component;
1616
import net.minecraft.resources.ResourceLocation;
17+
import net.minecraft.world.entity.EquipmentSlot;
18+
import net.minecraft.world.entity.EquipmentSlotGroup;
1719
import net.minecraft.world.entity.LivingEntity;
1820
import net.minecraft.tags.TagKey;
19-
import net.minecraft.world.entity.LivingEntity;
2021
import net.minecraft.world.entity.player.Player;
2122
import net.minecraft.world.item.ItemStack;
2223

@@ -385,7 +386,7 @@ public static void registerDefaults() {
385386
ItemParameter.class,
386387
(context, parameters) -> {
387388
if (context.getEntity() instanceof Player player) {
388-
final var item = BuiltInRegistries.ITEM.get(parameters.item().value());
389+
final var item = BuiltInRegistries.ITEM.getValue(parameters.item().value());
389390
return player.getInventory().countItem(item) >= parameters.count().value();
390391
}
391392
return false;
@@ -402,9 +403,12 @@ public static void registerDefaults() {
402403
NoParameter.class,
403404
(context, parameters) -> {
404405
if (context.getEntity() instanceof LivingEntity livingEntity) {
405-
for (final var itemStack : livingEntity.getArmorAndBodyArmorSlots()) {
406-
if (!itemStack.isEmpty()) {
407-
return true;
406+
for (final var equipmentslot : EquipmentSlotGroup.ARMOR) {
407+
if (equipmentslot.getType() == EquipmentSlot.Type.HUMANOID_ARMOR) {
408+
final var itemstack = livingEntity.getItemBySlot(equipmentslot);
409+
if (!itemstack.isEmpty()) {
410+
return true;
411+
}
408412
}
409413
}
410414
}

0 commit comments

Comments
 (0)