From 7765baf98c6f6a3411c9f5aa090875cea1c54399 Mon Sep 17 00:00:00 2001 From: gamma-delta <29877714+gamma-delta@users.noreply.github.com> Date: Thu, 24 Mar 2022 14:13:56 -0500 Subject: [PATCH] fix #29 --- .../hexcasting/common/casting/CastingContext.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/at/petrak/hexcasting/common/casting/CastingContext.kt b/src/main/java/at/petrak/hexcasting/common/casting/CastingContext.kt index fa17ea0e..7514c6e3 100644 --- a/src/main/java/at/petrak/hexcasting/common/casting/CastingContext.kt +++ b/src/main/java/at/petrak/hexcasting/common/casting/CastingContext.kt @@ -81,13 +81,6 @@ data class CastingContext( } fun isVecInRange(vec: Vec3): Boolean { - if (this.spellCircle != null) { - return this.spellCircle.aabb.contains(vec) - } - - if (vec.distanceToSqr(this.caster.position()) < Operator.MAX_DISTANCE * Operator.MAX_DISTANCE) - return true - val maybeSentinel = this.caster.getCapability(HexCapabilities.SENTINEL).resolve() if (maybeSentinel.isPresent) { val sentinel = maybeSentinel.get() @@ -98,6 +91,13 @@ data class CastingContext( return true } + if (this.spellCircle != null) { + return this.spellCircle.aabb.contains(vec) + } + + if (vec.distanceToSqr(this.caster.position()) < Operator.MAX_DISTANCE * Operator.MAX_DISTANCE) + return true + return false }