From 912bea3f69cd2e77c7c786637a90220126a35bac Mon Sep 17 00:00:00 2001
From: TomTom <93038247+AverageGithub@users.noreply.github.com>
Date: Thu, 13 Jun 2024 17:50:45 +0200
Subject: [PATCH] Try fix

---
 .../island/SuperiorSkyBlock2Integration.kt    |  8 ++++--
 .../minions/miniontype/MinerMinionType.kt     | 25 +++++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/integrations/island/SuperiorSkyBlock2Integration.kt b/common/src/main/kotlin/com/artillexstudios/axminions/integrations/island/SuperiorSkyBlock2Integration.kt
index 296a8da..d88b86e 100644
--- a/common/src/main/kotlin/com/artillexstudios/axminions/integrations/island/SuperiorSkyBlock2Integration.kt
+++ b/common/src/main/kotlin/com/artillexstudios/axminions/integrations/island/SuperiorSkyBlock2Integration.kt
@@ -12,12 +12,16 @@ class SuperiorSkyBlock2Integration : IslandIntegration {
     override fun getIslandPlaced(player: Player): Int {
         var placed = 0
         SuperiorSkyblockAPI.getPlayer(player.uniqueId).island?.getIslandMembers(true)?.forEach {
+            val a = AxMinionsAPI.INSTANCE.getDataHandler().getMinionAmount(it.uniqueId)
+            placed += a
             if (Config.DEBUG()) {
-                println("Member: ${it.name}")
+                println("Member: ${it.name} - $a")
             }
-            placed += AxMinionsAPI.INSTANCE.getDataHandler().getMinionAmount(it.uniqueId)
         }
 
+        if (Config.DEBUG()) {
+            println("Placed total: $placed")
+        }
         return placed
     }
 
diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/MinerMinionType.kt b/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/MinerMinionType.kt
index 189e221..8f8d85b 100644
--- a/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/MinerMinionType.kt
+++ b/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/MinerMinionType.kt
@@ -121,10 +121,11 @@ class MinerMinionType : MinionType("miner", AxMinionsPlugin.INSTANCE.getResource
                         drops.forEach {
                             amount += it.amount
                         }
-                        minion.addToContainerOrDrop(drops)
-                        block.type = Material.AIR
                         val integration = AxMinionsAPI.INSTANCE.getIntegrations().getIslandIntegration()
                         integration?.handleBlockBreak(block)
+
+                        minion.addToContainerOrDrop(drops)
+                        block.type = Material.AIR
                     }
                 }
             }
@@ -167,10 +168,11 @@ class MinerMinionType : MinionType("miner", AxMinionsPlugin.INSTANCE.getResource
                                         drops.forEach {
                                             amount += it.amount
                                         }
-                                        minion.addToContainerOrDrop(drops)
-                                        block.type = Material.AIR
                                         val integration = AxMinionsAPI.INSTANCE.getIntegrations().getIslandIntegration()
                                         integration?.handleBlockBreak(block)
+
+                                        minion.addToContainerOrDrop(drops)
+                                        block.type = Material.AIR
                                     }
                                 }
                             }
@@ -206,10 +208,11 @@ class MinerMinionType : MinionType("miner", AxMinionsPlugin.INSTANCE.getResource
                                 drops.forEach {
                                     amount += it.amount
                                 }
-                                minion.addToContainerOrDrop(drops)
-                                block.type = Material.AIR
                                 val integration = AxMinionsAPI.INSTANCE.getIntegrations().getIslandIntegration()
                                 integration?.handleBlockBreak(block)
+
+                                minion.addToContainerOrDrop(drops)
+                                block.type = Material.AIR
                             }
                         }
                 }
@@ -246,10 +249,11 @@ class MinerMinionType : MinionType("miner", AxMinionsPlugin.INSTANCE.getResource
                             drops.forEach { item ->
                                 amount += item.amount
                             }
-                            minion.addToContainerOrDrop(drops)
-                            block.type = Material.AIR
                             val integration = AxMinionsAPI.INSTANCE.getIntegrations().getIslandIntegration()
                             integration?.handleBlockBreak(block)
+
+                            minion.addToContainerOrDrop(drops)
+                            block.type = Material.AIR
                         }
                     }
                 }
@@ -299,10 +303,11 @@ class MinerMinionType : MinionType("miner", AxMinionsPlugin.INSTANCE.getResource
                                 amount += it.amount
                             }
 
-                            minion.addToContainerOrDrop(drops)
-                            block.type = Material.AIR
                             val integration = AxMinionsAPI.INSTANCE.getIntegrations().getIslandIntegration()
                             integration?.handleBlockBreak(block)
+
+                            minion.addToContainerOrDrop(drops)
+                            block.type = Material.AIR
                         }
                     }
             }