Use garden api more often

1 files changed, 10 insertions, 14 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt
index 940b955b8..d906be51a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt
@@ -137,20 +137,7 @@ class HyPixelData {
             }
         }
 
-        var islandType = IslandType.getBySidebarName(newIsland)
-
-        if (islandType == IslandType.PRIVATE_ISLAND) {
-            if (guesting) {
-                islandType = IslandType.PRIVATE_ISLAND_GUEST
-            }
-        }
-
-        if (islandType == IslandType.GARDEN) {
-            if (guesting) {
-                islandType = IslandType.GARDEN_GUEST
-            }
-        }
-
+        val islandType = getIslandType(newIsland, guesting)
         if (skyBlockIsland != islandType) {
             IslandChangeEvent(islandType, skyBlockIsland).postAndCatch()
             if (islandType == IslandType.UNKNOWN) {
@@ -163,6 +150,15 @@ class HyPixelData {
         }
     }
 
+    private fun getIslandType(newIsland: String, guesting: Boolean): IslandType {
+        val islandType = IslandType.getBySidebarName(newIsland)
+        if (guesting) {
+            if (islandType == IslandType.PRIVATE_ISLAND) return IslandType.PRIVATE_ISLAND_GUEST
+            if (islandType == IslandType.GARDEN) return IslandType.GARDEN_GUEST
+        }
+        return islandType
+    }
+
     private fun checkScoreboard(): Boolean {
         val minecraft = Minecraft.getMinecraft()
         val world = minecraft.theWorld ?: return false