BedCity ignores sand blocks

Luna5ama · Sep 13, 2023 · 1827fce · 1827fce
1 parent 040dc62
commit 1827fce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/main/kotlin/dev/luna5ama/trollhack/module/modules/combat/BedCity.kt b/src/main/kotlin/dev/luna5ama/trollhack/module/modules/combat/BedCity.kt
@@ -10,9 +10,13 @@ import dev.luna5ama.trollhack.module.Module
 import dev.luna5ama.trollhack.module.modules.player.PacketMine
 import dev.luna5ama.trollhack.util.EntityUtils.betterPosition
 import dev.luna5ama.trollhack.util.math.VectorUtils.setAndAdd
+import dev.luna5ama.trollhack.util.world.canBreakBlock
 import dev.luna5ama.trollhack.util.world.checkBlockCollision
 import dev.luna5ama.trollhack.util.world.isAir
 import dev.luna5ama.trollhack.util.world.isFullBox
+import net.minecraft.block.BlockConcretePowder
+import net.minecraft.block.BlockFalling
+import net.minecraft.block.BlockSand
 import net.minecraft.util.EnumFacing
 import net.minecraft.util.math.BlockPos
 
@@ -77,7 +81,15 @@ internal object BedCity : Module(
         )
 
         fun checkEmpty(pos: BlockPos): Boolean {
-            return if (ignoreNonFullBox) !world.getBlockState(pos).isFullBox else world.isAir(pos)
+            if (!world.canBreakBlock(pos)) return true
+
+            val blockState = world.getBlockState(pos)
+            val block = blockState.block
+            if (block is BlockFalling) return true
+            if (blockState.isAir) return true
+            if (ignoreNonFullBox && !blockState.isFullBox) return false
+
+            return false
         }
 
         fun minePos(minePos: BlockPos?): Boolean {

diff --git a/src/main/kotlin/dev/luna5ama/trollhack/module/modules/exploit/SandPop.kt b/src/main/kotlin/dev/luna5ama/trollhack/module/modules/exploit/SandPop.kt
@@ -14,6 +14,7 @@ import dev.luna5ama.trollhack.util.world.PlacementSearchOption
 import dev.luna5ama.trollhack.util.world.getPlacementSequence
 import dev.luna5ama.trollhack.util.world.placeBlock
 import net.minecraft.block.BlockConcretePowder
+import net.minecraft.block.BlockFalling
 import net.minecraft.block.BlockSand
 import net.minecraft.init.Blocks
 import net.minecraft.util.math.BlockPos
@@ -38,7 +39,7 @@ internal object SandPop : Module(
 
                 val sandSlot = player.allSlotsPrioritized.firstByStack {
                     val block = it.item.block
-                    block is BlockSand || block is BlockConcretePowder
+                    block is BlockFalling
                 } ?: run {
                     Notification.send(SandPop, "No sand or concrete powder found")
                     return@runSafe