From 15f7f7c00841c0e4595218012e057d1ac514d1b7 Mon Sep 17 00:00:00 2001
From: "Erymanthus[#5074] | (u/)RayDeeUx"
 <51521765+RayDeeUx@users.noreply.github.com>
Date: Sun, 26 May 2024 20:20:32 -0400
Subject: [PATCH] more.

---
 .../skyhanni/features/misc/WhereWillIBe.kt       | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/WhereWillIBe.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/WhereWillIBe.kt
index 5957048c9156..fdda50ce0443 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/WhereWillIBe.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/WhereWillIBe.kt
@@ -51,8 +51,6 @@ object WhereWillIBe {
         repeat(Random.nextInt(2, 11)) {
             lastUsedMillis = randomMillis(lastUsedMillis)
             lastIsland = chooseIsland(lastIsland, chooseIslandsList(islandsAsList))
-            if (lastIsland in onceOnlyIslands)
-                islandsAsList.remove(lastIsland)
             ChatUtils.chat(
                 "§e${formattedDate(Date(lastUsedMillis))} - ${randomServerID(lastIsland)} - ${randomIsland(lastIsland)}",
                 false
@@ -93,9 +91,23 @@ object WhereWillIBe {
             islandToReturn in nonIslands
         )
             islandToReturn = chosenIslandsList.shuffled().first()
+        removeIfNecessary(
+            islandToReturn,
+            chosenIslandsList.toMutableList()
+        )
         return islandToReturn
     }
 
+    private fun removeIfNecessary(
+        lastIsland: IslandType,
+        islandsAsList: MutableList<IslandType>
+    ) {
+        if (lastIsland in onceOnlyIslands)
+            islandsAsList.remove(
+                lastIsland
+            )
+    }
+
     private fun randomIsland(
         chosenIsland: IslandType
     ): String =