From 7dde078a120031be333f18a7d54c9f41e7f1d330 Mon Sep 17 00:00:00 2001 From: gamma-delta Date: Wed, 20 Nov 2024 09:41:17 -0600 Subject: [PATCH] make armor stands no longer 'living' --- .../common/casting/actions/selectors/OpGetEntitiesBy.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/selectors/OpGetEntitiesBy.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/selectors/OpGetEntitiesBy.kt index e5af57ad7..1ae7a0a1c 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/selectors/OpGetEntitiesBy.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/selectors/OpGetEntitiesBy.kt @@ -12,6 +12,7 @@ import net.minecraft.world.entity.LivingEntity import net.minecraft.world.entity.animal.Animal import net.minecraft.world.entity.animal.WaterAnimal import net.minecraft.world.entity.boss.EnderDragonPart +import net.minecraft.world.entity.decoration.ArmorStand import net.minecraft.world.entity.item.ItemEntity import net.minecraft.world.entity.monster.Enemy import net.minecraft.world.entity.player.Player @@ -53,6 +54,6 @@ class OpGetEntitiesBy(val checker: Predicate, val negate: Boolean) : Con fun isPlayer(e: Entity): Boolean = e is Player @JvmStatic - fun isLiving(e: Entity): Boolean = (e is LivingEntity) || (e is EnderDragonPart) + fun isLiving(e: Entity): Boolean = (e !is ArmorStand) && (e is LivingEntity || e is EnderDragonPart) } }