fix(LeastDifferencePreference): preferred spot (#5667)

CCBlueX · Feb 21, 2025 · 528fd51 · 528fd51
1 parent eb6a2bf
commit 528fd51
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/...main/kotlin/net/ccbluex/liquidbounce/utils/aiming/preference/LeastDifferencePreference.kt b/...main/kotlin/net/ccbluex/liquidbounce/utils/aiming/preference/LeastDifferencePreference.kt
@@ -43,22 +43,20 @@ class LeastDifferencePreference(
         return eyesPos + baseRotation.directionVector * range
     }
 
-    override fun getPreferredSpotOnBox(box: Box, eyesPos: Vec3d, range: Double): Vec3d? {
+    override fun getPreferredSpotOnBox(box: Box, eyesPos: Vec3d, range: Double): Vec3d {
         if (basePoint != null) {
             return basePoint
         }
 
-        if (box.contains(eyesPos)) {
-            return eyesPos
-        }
-
         val preferredSpot = getPreferredSpot(eyesPos, range)
         if (box.contains(preferredSpot)) {
             return preferredSpot
         }
 
         val look = Line(eyesPos, preferredSpot - eyesPos)
-        return look.getPointOnBoxInDirection(box)?.takeIf { it.squaredDistanceTo(eyesPos) <= range.sq() }
+        return look.getPointOnBoxInDirection(box)
+            ?.takeIf { it.squaredDistanceTo(eyesPos) <= range.sq() }
+            ?: preferredSpot
     }
 
     override fun compare(o1: Rotation, o2: Rotation): Int {

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/preference/RotationPreference.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/preference/RotationPreference.kt
@@ -26,7 +26,7 @@ interface RotationPreference : Comparator<Rotation> {
 
     fun getPreferredSpot(eyesPos: Vec3d, range: Double, ): Vec3d
 
-    fun getPreferredSpotOnBox(box: Box, eyesPos: Vec3d, range: Double): Vec3d? {
+    fun getPreferredSpotOnBox(box: Box, eyesPos: Vec3d, range: Double): Vec3d {
         return getPreferredSpot(eyesPos, range)
     }
 

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/utils/RotationFinding.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/utils/RotationFinding.kt
@@ -307,7 +307,7 @@ fun raytraceBox(
     val rangeSquared = range * range
     val wallsRangeSquared = wallsRange * wallsRange
 
-    val preferredSpot = rotationPreference.getPreferredSpotOnBox(box, eyes, range) ?: return null
+    val preferredSpot = rotationPreference.getPreferredSpotOnBox(box, eyes, range)
     val preferredSpotOnBox = if (box.contains(eyes) && box.contains(preferredSpot)) {
         preferredSpot
     } else {