From 53f5feafaf799715140119ee4ee360d7c6e1a4f9 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Thu, 9 Mar 2023 20:06:15 +0100 Subject: Garden guis no longer show on other peoples gardens. --- src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt | 8 ++++++-- src/main/java/at/hannibal2/skyhanni/data/IslandType.kt | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/main') diff --git a/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt index 2893e67a4..940b955b8 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt @@ -112,8 +112,6 @@ class HyPixelData { bingo = true } - // TODO implemennt stranded check - " §7♲ §7Ironman" -> { ironman = true } @@ -147,6 +145,12 @@ class HyPixelData { } } + if (islandType == IslandType.GARDEN) { + if (guesting) { + islandType = IslandType.GARDEN_GUEST + } + } + if (skyBlockIsland != islandType) { IslandChangeEvent(islandType, skyBlockIsland).postAndCatch() if (islandType == IslandType.UNKNOWN) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt index 74081a5c4..aa6a02b13 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt @@ -16,6 +16,7 @@ enum class IslandType(val displayName: String, val apiName: String = "null") { DEEP_CAVERNS("Deep Caverns", "deep_caverns"), GOLD_MINES("Gold Mine", "gold_mine"),//TODO confirm GARDEN("Garden"), + GARDEN_GUEST("Garden Guest"), NONE(""), UNKNOWN("???"), -- cgit