Merge pull request #440 from OKTW-Network/fix-harvest

Fix hand events
OKTW-Network · Aug 18, 2024 · c6c614f · c6c614f
2 parents 0b4b104 + cdf6043
commit c6c614f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/main/kotlin/one/oktw/galaxy/item/event/Wrench.kt b/src/main/kotlin/one/oktw/galaxy/item/event/Wrench.kt
@@ -1,6 +1,6 @@
 /*
  * OKTW Galaxy Project
- * Copyright (C) 2018-2023
+ * Copyright (C) 2018-2024
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -79,6 +79,7 @@ class Wrench {
             startDirection[player] = blockPos to direction
 
             blockEntity.facing = if (next == -1 || next > allowedFacing.lastIndex) allowedFacing.first() else allowedFacing[next]
+            return true
         }
 
         // Check destructible
@@ -213,7 +214,8 @@ class Wrench {
 
         world.setBlockState(blockPos, newState)
         world.updateNeighbor(newState, blockPos, newState.block, blockPos, true)
-        Block.postProcessState(newState, world, blockPos).let { if (!it.isAir) world.setBlockState(blockPos, it, 2) }
+        // Workaround disable state update for bell
+        Block.postProcessState(newState, world, blockPos).let { if (!it.isAir && it.block != BELL) world.setBlockState(blockPos, it, 2) }
 
         return true
     }

diff --git a/src/main/kotlin/one/oktw/galaxy/player/Harvest.kt b/src/main/kotlin/one/oktw/galaxy/player/Harvest.kt
@@ -1,6 +1,6 @@
 /*
  * OKTW Galaxy Project
- * Copyright (C) 2018-2023
+ * Copyright (C) 2018-2024
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -44,7 +44,11 @@ class Harvest {
         val blockPos = event.packet.blockHitResult.blockPos
         val blockState = world.getBlockState(blockPos)
 
-        if (event.packet.hand == Hand.MAIN_HAND && !player.isSneaking && isMature(world, blockPos, blockState)) {
+        if (
+            event.packet.hand == Hand.MAIN_HAND &&
+            (!player.isSneaking || (player.mainHandStack.isEmpty && player.offHandStack.isEmpty)) &&
+            isMature(world, blockPos, blockState)
+        ) {
             event.cancel = true
             val block = blockState.block
             val ageProperties = when (block) {