Skip to content

Commit 7dde078

Browse files
committed
make armor stands no longer 'living'
1 parent 2e4d53f commit 7dde078

File tree

1 file changed

+2
-1
lines changed
  • Common/src/main/java/at/petrak/hexcasting/common/casting/actions/selectors

1 file changed

+2
-1
lines changed

Common/src/main/java/at/petrak/hexcasting/common/casting/actions/selectors/OpGetEntitiesBy.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import net.minecraft.world.entity.LivingEntity
1212
import net.minecraft.world.entity.animal.Animal
1313
import net.minecraft.world.entity.animal.WaterAnimal
1414
import net.minecraft.world.entity.boss.EnderDragonPart
15+
import net.minecraft.world.entity.decoration.ArmorStand
1516
import net.minecraft.world.entity.item.ItemEntity
1617
import net.minecraft.world.entity.monster.Enemy
1718
import net.minecraft.world.entity.player.Player
@@ -53,6 +54,6 @@ class OpGetEntitiesBy(val checker: Predicate<Entity>, val negate: Boolean) : Con
5354
fun isPlayer(e: Entity): Boolean = e is Player
5455

5556
@JvmStatic
56-
fun isLiving(e: Entity): Boolean = (e is LivingEntity) || (e is EnderDragonPart)
57+
fun isLiving(e: Entity): Boolean = (e !is ArmorStand) && (e is LivingEntity || e is EnderDragonPart)
5758
}
5859
}

0 commit comments

Comments
 (0)