Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #83

Browse source
This commit is contained in:
gamma-delta 2022-05-21 17:45:40 -05:00
parent bc38d0e1b4
commit fef9e5f011
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetEntitiesBy.kt
View file

@ -12,8 +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.item.ItemEntity
import net.minecraft.world.entity.monster.Monster
import net.minecraft.world.entity.monster.Slime
import net.minecraft.world.entity.monster.Enemy
import net.minecraft.world.entity.player.Player
import net.minecraft.world.phys.AABB
import net.minecraft.world.phys.Vec3
@ -31,7 +30,11 @@ class OpGetEntitiesBy(val checker: Predicate<Entity>, val negate: Boolean) : Con
val entitiesGot = ctx.world.getEntities(
null,
aabb
) { (checker.test(it) != negate) && ctx.isEntityInRange(it) && it.isAlive && !it.isSpectator && it.distanceToSqr(pos) <= radius * radius }
) {
(checker.test(it) != negate) && ctx.isEntityInRange(it) && it.isAlive && !it.isSpectator && it.distanceToSqr(
pos
) <= radius * radius
}
.sortedBy { it.distanceToSqr(pos) }
return spellListOf(entitiesGot)
}
@ -42,7 +45,7 @@ class OpGetEntitiesBy(val checker: Predicate<Entity>, val negate: Boolean) : Con
fun isAnimal(e: Entity): Boolean = e is Animal || e is WaterAnimal
@JvmStatic
fun isMonster(e: Entity): Boolean = e is Monster || e is Slime
fun isMonster(e: Entity): Boolean = e is Enemy
@JvmStatic
fun isItem(e: Entity): Boolean = e is ItemEntity

1
Fabric/build.gradle
View file

@ -86,4 +86,3 @@ processResources {
expand "version": project.version
}
}