fix(Surround): wrong plan hole creation (#5555)

CCBlueX · Feb 7, 2025 · f573952 · f573952
1 parent 1101f50
commit f573952
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/world/ModuleSurround.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/world/ModuleSurround.kt
@@ -46,11 +46,13 @@ import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket
 import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket
 import net.minecraft.network.packet.s2c.play.ChunkDeltaUpdateS2CPacket
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Box
 import net.minecraft.util.math.Direction
 import net.minecraft.util.math.Vec3i
 import org.joml.Vector2d
 import kotlin.math.abs
 import kotlin.math.ceil
+import kotlin.math.floor
 
 /**
  * Surround module
@@ -298,11 +300,13 @@ object ModuleSurround : ClientModule("Surround", Category.WORLD, disableOnQuit =
         val hole = if (noWaste && player.isInHole(feetBlockPos)) {
             setOf(feetBlockPos)
         } else {
+            val maxX = getMax(bb, Direction.Axis.X)
+            val maxZ = getMax(bb, Direction.Axis.Z)
             setOf(
                 BlockPos.ofFloored(bb.minX, y, bb.minZ),
-                BlockPos.ofFloored(bb.minX, y, bb.maxZ),
-                BlockPos.ofFloored(bb.maxX, y, bb.minZ),
-                BlockPos.ofFloored(bb.maxX, y, bb.maxZ),
+                BlockPos.ofFloored(bb.minX, y, maxZ),
+                BlockPos.ofFloored(maxX, y, bb.minZ),
+                BlockPos.ofFloored(maxX, y, maxZ),
             )
         }
 
@@ -402,11 +406,13 @@ object ModuleSurround : ClientModule("Surround", Category.WORLD, disableOnQuit =
     private fun getEntitySurround(entity: Entity, list: HashSet<BlockPos>, blocked: HashSet<BlockPos>, y: Double) {
         val bb = entity.boundingBox
 
+        val maxX = getMax(bb, Direction.Axis.X)
+        val maxZ = getMax(bb, Direction.Axis.Z)
         val hole = setOf(
             BlockPos.ofFloored(bb.minX, y, bb.minZ),
-            BlockPos.ofFloored(bb.minX, y, bb.maxZ),
-            BlockPos.ofFloored(bb.maxX, y, bb.minZ),
-            BlockPos.ofFloored(bb.maxX, y, bb.maxZ),
+            BlockPos.ofFloored(bb.minX, y, maxZ),
+            BlockPos.ofFloored(maxX, y, bb.minZ),
+            BlockPos.ofFloored(maxX, y, maxZ),
         )
 
         blocked.addAll(hole)
@@ -422,4 +428,15 @@ object ModuleSurround : ClientModule("Surround", Category.WORLD, disableOnQuit =
         }
     }
 
+    private fun getMax(boundingBox: Box, axis: Direction.Axis): Double {
+        val max = boundingBox.getMax(axis)
+        val min = boundingBox.getMin(axis)
+
+        return if (max == floor(min) + 1.0) {
+            min
+        } else {
+            max
+        }
+    }
+
 }