fix: attribute being reset between breaking vanilla & custom block

MineInAbyss · May 17, 2024 · 03f96c2 · 03f96c2
1 parent 994a4ea
commit 03f96c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/kotlin/com/mineinabyss/blocky/listeners/BlockyGenericListener.kt b/src/main/kotlin/com/mineinabyss/blocky/listeners/BlockyGenericListener.kt
@@ -31,7 +31,7 @@ class BlockyGenericListener : Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     fun BlockDamageEvent.onDamageCustomBlock() {
-        player.miningAttribute?.removeModifier(player)
+        player.miningAttribute?.takeUnless { block.isVanillaNoteBlock }?.removeModifier(player)
         if (player.gameMode == GameMode.CREATIVE) return
 
         val breaking = block.toGearyOrNull()?.get<BlockyBreaking>() ?: return

diff --git a/src/main/kotlin/com/mineinabyss/blocky/listeners/BlockyNoteBlockListener.kt b/src/main/kotlin/com/mineinabyss/blocky/listeners/BlockyNoteBlockListener.kt
@@ -17,6 +17,7 @@ import com.mineinabyss.geary.papermc.tracking.blocks.helpers.toGearyOrNull
 import com.mineinabyss.geary.papermc.tracking.entities.toGearyOrNull
 import com.mineinabyss.idofront.entities.rightClicked
 import com.mineinabyss.idofront.messaging.broadcastVal
+import org.bukkit.GameMode
 import org.bukkit.Material
 import org.bukkit.attribute.Attribute
 import org.bukkit.block.data.type.NoteBlock
@@ -34,9 +35,10 @@ class BlockyNoteBlockListener : Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     fun BlockDamageEvent.onDamageVanillaBlock() {
-        player.miningAttribute?.removeModifier(player)
+        // Return before removing as this is handled by BlockyGenericListener
+        player.miningAttribute?.takeUnless { block.isBlockyBlock }?.removeModifier(player)
 
-        if (!block.isVanillaNoteBlock) return
+        if (player.gameMode == GameMode.CREATIVE || !block.isVanillaNoteBlock) return
 
         val mining = PlayerMiningAttribute(NoteBlockHelpers.vanillaBreakingComponent.createBreakingModifier(player, block))
         player.toGearyOrNull()?.set(mining)