From b43cf75809e192fc76cc2c1c3f410223e64dadb6 Mon Sep 17 00:00:00 2001
From: Th3Shadowbroker <webmaster@m4taiori.de>
Date: Sat, 28 Jan 2023 10:49:00 +0100
Subject: [PATCH 1/3] Fix missing block-break effect for custom blocks

---
 .../ouroboros/mines/thirdparty/ItemsAdderSupport.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/dev/th3shadowbroker/ouroboros/mines/thirdparty/ItemsAdderSupport.java b/src/main/java/dev/th3shadowbroker/ouroboros/mines/thirdparty/ItemsAdderSupport.java
index bcd9d38..f0b0944 100644
--- a/src/main/java/dev/th3shadowbroker/ouroboros/mines/thirdparty/ItemsAdderSupport.java
+++ b/src/main/java/dev/th3shadowbroker/ouroboros/mines/thirdparty/ItemsAdderSupport.java
@@ -62,7 +62,12 @@ public void onDefaultDropsCheck(DefaultDropsCheckEvent event) {
 
     @EventHandler
     public void onRemoveCustomBlock(RemoveCustomBlockEvent event) {
-        Optional.ofNullable(CustomBlock.byAlreadyPlaced(event.getBlock())).ifPresent(CustomBlock::remove);
+        Optional.ofNullable(CustomBlock.byAlreadyPlaced(event.getBlock())).ifPresent(cb -> {
+            cb.playBreakEffect();
+            cb.playBreakParticles();
+            cb.playBreakSound();
+            cb.remove();
+        });
     }
 
     @EventHandler

From 5d5cacc9671547d92aa3a817432e66194aba7dfb Mon Sep 17 00:00:00 2001
From: Th3Shadowbroker <webmaster@m4taiori.de>
Date: Sat, 28 Jan 2023 10:50:35 +0100
Subject: [PATCH 2/3] Bump 1.12.0 -> 1.12.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2dce538..4b415b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>dev.th3shadowbroker.spigot</groupId>
   <artifactId>OuroborosMines</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.12.1-SNAPSHOT</version>
 
   <properties>
     <plugin.name>${project.artifactId}</plugin.name>

From cbe4a923b00af815227efee6c625768d2024e047 Mon Sep 17 00:00:00 2001
From: Th3Shadowbroker <webmaster@m4taiori.de>
Date: Sat, 28 Jan 2023 14:58:36 +0100
Subject: [PATCH 3/3] Handle blocks correctly when they are assigned to a
 drop-group

---
 .../ouroboros/mines/listeners/BlockBreakListener.java    | 9 ++++++++-
 .../ouroboros/mines/thirdparty/ItemsAdderSupport.java    | 2 --
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/dev/th3shadowbroker/ouroboros/mines/listeners/BlockBreakListener.java b/src/main/java/dev/th3shadowbroker/ouroboros/mines/listeners/BlockBreakListener.java
index b56d955..49562be 100644
--- a/src/main/java/dev/th3shadowbroker/ouroboros/mines/listeners/BlockBreakListener.java
+++ b/src/main/java/dev/th3shadowbroker/ouroboros/mines/listeners/BlockBreakListener.java
@@ -173,6 +173,10 @@ private void breakNaturally(BlockBreakEvent event, MineableMaterial mineableMate
 
                 Player player = event.getPlayer();
                 Location blockLocation = event.getBlock().getLocation();
+
+                removeCustomBlockClaim(event.getBlock());
+                event.getBlock().setType(Material.AIR);
+
                 Map<Integer, ItemStack> overflow = player.getInventory().addItem(drops.stream().toArray(ItemStack[]::new));
                 overflow.values().forEach(i -> blockLocation.getWorld().dropItem(blockLocation, i));
             } else {
@@ -185,7 +189,7 @@ private void breakNaturally(BlockBreakEvent event, MineableMaterial mineableMate
                     Location blockLocation = event.getBlock().getLocation();
 
                     removeCustomBlockClaim(event.getBlock());
-                    blockLocation.getBlock().setType(Material.AIR);
+                    event.getBlock().setType(Material.AIR);
 
                     customDefaultDrops.get().forEach(
                             itemStack -> {
@@ -194,6 +198,9 @@ private void breakNaturally(BlockBreakEvent event, MineableMaterial mineableMate
                     );
                 }
             }
+        } else {
+            removeCustomBlockClaim(event.getBlock());
+            event.getBlock().setType(Material.AIR);
         }
     }
 
diff --git a/src/main/java/dev/th3shadowbroker/ouroboros/mines/thirdparty/ItemsAdderSupport.java b/src/main/java/dev/th3shadowbroker/ouroboros/mines/thirdparty/ItemsAdderSupport.java
index f0b0944..c05c13c 100644
--- a/src/main/java/dev/th3shadowbroker/ouroboros/mines/thirdparty/ItemsAdderSupport.java
+++ b/src/main/java/dev/th3shadowbroker/ouroboros/mines/thirdparty/ItemsAdderSupport.java
@@ -64,8 +64,6 @@ public void onDefaultDropsCheck(DefaultDropsCheckEvent event) {
     public void onRemoveCustomBlock(RemoveCustomBlockEvent event) {
         Optional.ofNullable(CustomBlock.byAlreadyPlaced(event.getBlock())).ifPresent(cb -> {
             cb.playBreakEffect();
-            cb.playBreakParticles();
-            cb.playBreakSound();
             cb.remove();
         });
     }