fixes

Author: beanbag44

common/src/main/kotlin/com/lambda/module/modules/player/PacketMineTaskRewrite.kt

@@ -183,11 +183,11 @@ object PacketMineTaskRewrite : Module(
                 instantBreak
             )
             packetBreakTask = PacketBreakBlock(
-                ctx = breakContext,
-                tool = bestTool,
-                breakThreshold = breakThreshold,
-                internalBreakConfirmation = breakConfirmation,
-                swingHand = swingHand
+                breakContext,
+                bestTool,
+                breakThreshold,
+                breakConfirmation,
+                swingHand
             ).finally {
                 breakTasks[breakType.index] = null
             } as PacketBreakBlock

common/src/main/kotlin/com/lambda/task/tasks/PacketBreakBlock.kt

@@ -49,7 +49,6 @@ import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket.Action
 import net.minecraft.screen.slot.SlotActionType
 import net.minecraft.sound.SoundCategory
-import net.minecraft.text.Text
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 
@@ -89,6 +88,7 @@ class PacketBreakBlock @Ta5kBuilder constructor(
     private var toolStack: ItemStack? = null
     private var toolSlot: Int = -1
 
+    private var startedBreaking = false
     private var progress = 0.0f
     private var soundCooldown = 0.0f
 
@@ -134,6 +134,7 @@ class PacketBreakBlock @Ta5kBuilder constructor(
                 if (!collectDrop) {
                     breakBlock()
                     success(itemDrop)
+                    return@listen
                 }
 
                 if (!world.entities.contains(itemDrop)) {
@@ -223,7 +224,7 @@ class PacketBreakBlock @Ta5kBuilder constructor(
             return true
         }
 
-        if (progress == 0.0f) return attackBlock()
+        if (!startedBreaking) return attackBlock()
 
         val blockState: BlockState = world.getBlockState(blockPos)
         if (blockState.isAir) {
@@ -271,19 +272,15 @@ class PacketBreakBlock @Ta5kBuilder constructor(
         }
 
         if (breakingTexture) {
-            world.setBlockBreakingInfo(
-                player.id,
-                blockPos,
-                getBlockBreakingProgress()
-            )
+            setBreakingTextureStage()
         }
 
         return true
     }
 
     private fun SafeContext.getBlockBreakingProgress(): Int =
-        if (progress > 0.0F)
-                ((progress / breakThreshold) * 10.0F).toInt()
+        if (progress > 0.0f)
+                ((progress / breakThreshold) * 10.0f).toInt()
         else
             -1
 
@@ -302,7 +299,7 @@ class PacketBreakBlock @Ta5kBuilder constructor(
 
             return true
         }
-        if (progress != 0.0f) return false
+        if (startedBreaking) return false
 
         val blockState: BlockState = world.getBlockState(blockPos)
         var pendingUpdateManager = world.pendingUpdateManager.incrementSequence()
@@ -316,17 +313,15 @@ class PacketBreakBlock @Ta5kBuilder constructor(
             onBlockBreak()
             startBreakPacket(blockPos, side, sequence)
             return true
+        } else {
+            startedBreaking = true
         }
 
         if (sounds)
             soundCooldown = 0.0f
 
         if (breakingTexture) {
-            world.setBlockBreakingInfo(
-                player.id,
-                blockPos,
-                this@attackBlock.getBlockBreakingProgress()
-            )
+            setBreakingTextureStage()
         }
         abortBreakPacket(blockPos, side, sequence)
         stopBreakPacket(blockPos, side, sequence + 1)
@@ -350,6 +345,9 @@ class PacketBreakBlock @Ta5kBuilder constructor(
 
     private fun SafeContext.breakBlock() {
         interaction.breakBlock(blockPos)
+        if (breakingTexture) {
+            setBreakingTextureStage(-1)
+        }
     }
 
     private fun SafeContext.updateToolInformation() {
@@ -361,6 +359,14 @@ class PacketBreakBlock @Ta5kBuilder constructor(
         toolSlot = player.inventory.getSlotWithStack(toolStack)
     }
 
+    private fun SafeContext.setBreakingTextureStage(stage: Int = getBlockBreakingProgress()) {
+        world.setBlockBreakingInfo(
+            player.id,
+            blockPos,
+            stage
+        )
+    }
+
     private fun SafeContext.swing() =
         player.swingHand(player.activeHand)