aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-10-11 17:49:17 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-10-11 17:49:17 +0200
commit7d6503b05de3a2db7af247c0cc32b341bf636a37 (patch)
tree183ca827ee7a83dd39a77beb4a26e4e3b0741d5a /src/main/java/at
parent097f314f95960c565f076d76f176721fa7c8c445 (diff)
downloadskyhanni-7d6503b05de3a2db7af247c0cc32b341bf636a37.tar.gz
skyhanni-7d6503b05de3a2db7af247c0cc32b341bf636a37.tar.bz2
skyhanni-7d6503b05de3a2db7af247c0cc32b341bf636a37.zip
Fixed lever clicks get highlighted in water room.
Diffstat (limited to 'src/main/java/at')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt5
2 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
index 36ab4e3d8..a3129ad8c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@@ -93,6 +93,8 @@ class DungeonAPI {
val floor = dungeonFloor ?: return null
return DungeonFloor.valueOf(floor.replace("M", "F"))
}
+
+ fun getFloorId() = ScoreboardData.sidebarLines.firstOrNull()?.removeColor()?.split(" ")?.getOrNull(2)
}
@SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
index 11b36e454..fa3592940 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
@@ -55,6 +55,11 @@ class DungeonHighlightClickedBlocks {
else -> return
}
+ // Water room
+ if (DungeonAPI.getFloorId() == "-60,-60") {
+ return
+ }
+
if (type == ClickedBlockType.WITHER_ESSENCE) {
val text = BlockUtils.getTextureFromSkull(position.toBlocPos())
if (text != "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQ" +