From 723a3eeb0424c03fdeee28dbfaf8e2df020838ca Mon Sep 17 00:00:00 2001
From: TomTom <93038247+AverageGithub@users.noreply.github.com>
Date: Sat, 29 Jun 2024 10:46:51 +0200
Subject: [PATCH] Fox

---
 .../artillexstudios/axminions/commands/AxMinionsCommand.kt  | 6 ++++--
 .../axminions/listeners/MinionPlaceListener.kt              | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt b/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt
index 099052f..c0f2753 100644
--- a/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt
+++ b/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt
@@ -136,7 +136,7 @@ class AxMinionsCommand {
     @Subcommand("recalc")
     @CommandPermission("axminions.command.recalc")
     fun recalc(player: Player) {
-        val islandId = AxMinionsAPI.INSTANCE.getIntegrations().getIslandIntegration()!!.getIslandAt(player.location)
+        val islandId = AxMinionsAPI.INSTANCE.getIntegrations().getIslandIntegration()?.getIslandAt(player.location) ?: return
         AxMinionsPlugin.dataQueue.submit {
             var original = 0
             if (islandId.isNotBlank()) {
@@ -149,6 +149,7 @@ class AxMinionsCommand {
             if (integration is SuperiorSkyBlock2Integration) {
                 val island = SuperiorSkyblockAPI.getIslandAt(player.location) ?: return@submit
 
+                var counter = 0
                 val minions = Minions.getMinions()
                 Environment.entries.forEach { entry ->
                     try {
@@ -160,12 +161,13 @@ class AxMinionsCommand {
                                     val ch = minion.getLocation().chunk
                                     if (ch.x == chunk.x && ch.z == chunk.z && ch.world == chunk.world) {
                                         AxMinionsPlugin.dataHandler.islandPlace(islandId)
+                                        counter++
                                     }
                                 }
                             }
                         }
                         CompletableFuture.allOf(*futures.toTypedArray()).thenRun {
-                            player.sendMessage(StringUtils.formatToString(Messages.PREFIX() + Messages.RECALC(), Placeholder.unparsed("from", original.toString()), Placeholder.unparsed("to", futures.size.toString())))
+                            player.sendMessage(StringUtils.formatToString(Messages.PREFIX() + Messages.RECALC(), Placeholder.unparsed("from", original.toString()), Placeholder.unparsed("to", counter.toString())))
                         }
                     } catch (_: NullPointerException) {
                         // SuperiorSkyBlock api does it this way aswell
diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionPlaceListener.kt b/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionPlaceListener.kt
index 29346c9..ad93986 100644
--- a/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionPlaceListener.kt
+++ b/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionPlaceListener.kt
@@ -113,6 +113,7 @@ class MinionPlaceListener : Listener {
                         if (Config.DEBUG()) {
                             event.player.sendMessage("Not return ${islandPlaced >= islandLimit} ${!event.player.hasPermission("axminions.limit.*")}")
                         }
+                        islandPlaced++
                     }
                 }
             }