diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-03-09 20:06:15 +0100 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-03-09 20:06:15 +0100 |
| commit | c68c5ab0d417b70380a47a57535034f598df4cfb (patch) | |
| tree | e8fb3d2953c8240d1a12c4adb56d1c14d9d0f170 | |
| parent | 93c60d7bd956ca5f922c8f3bb54e8736427aef61 (diff) | |
| download | SkyHanni-c68c5ab0d417b70380a47a57535034f598df4cfb.tar.gz SkyHanni-c68c5ab0d417b70380a47a57535034f598df4cfb.tar.bz2 SkyHanni-c68c5ab0d417b70380a47a57535034f598df4cfb.zip | |
Garden guis no longer show on other peoples gardens.
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt | 8 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/IslandType.kt | 1 |
2 files changed, 7 insertions, 2 deletions
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("???"), |