diff options
author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-02-02 20:41:21 +0100 |
---|---|---|
committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-02-02 20:41:21 +0100 |
commit | 7b329087dc47842e2a8337e650e6c037230da7ba (patch) | |
tree | 0855c1586309df64d9469d075c355a38b0e6e057 /src/main/java/at/hannibal2 | |
parent | ee0ae23560e911fbec5e5262feaaa58dc5d52e7a (diff) | |
download | skyhanni-7b329087dc47842e2a8337e650e6c037230da7ba.tar.gz skyhanni-7b329087dc47842e2a8337e650e6c037230da7ba.tar.bz2 skyhanni-7b329087dc47842e2a8337e650e6c037230da7ba.zip |
Shark fishing timer fix and other misc stuff.
Diffstat (limited to 'src/main/java/at/hannibal2')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java index 386a8fd4b..35c764116 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java @@ -103,6 +103,7 @@ public class Chat { "except for players who are close to the player, inside dungeon or during a Kuudra fight.") @ConfigEditorBoolean public boolean hideFarDeathMessages = false; + //TODO jawbus + x @Expose @ConfigOption(name = "Compact Potion Message", desc = "Shorten chat messages about player potion effects.") diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt index ffbbb3085..49673a208 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt @@ -63,7 +63,7 @@ class DungeonCleanEnd { if (lastBossId == -1) return if (event.entity.entityId != lastBossId) return - if (event.health < 1) { + if (event.health <= 0) { val dungeonFloor = DungeonData.dungeonFloor LorenzUtils.chat("§eFloor $dungeonFloor done!") bossDone = true diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt index 30ee3f8eb..439dcd940 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt @@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent class SharkFishCounter { private var counter = 0 - private var display = "$counter sharks caught" + private var display = "" private var tick = 0 private var hasWaterRodInHand = false diff --git a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt index d776cfa01..41da163b0 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt @@ -45,8 +45,7 @@ object APIUtil { return parser.parse(retSrc) as JsonObject } catch (e: JsonSyntaxException) { if (retSrc.contains("<center><h1>502 Bad Gateway</h1></center>")) { - println("502 Bad Gateway at getJSONResponse '$urlString'") - LorenzUtils.error("[SkyHanni] Hypixel API error: 502 Bad Gateway!") + LorenzUtils.error("[SkyHanni] HyPixel API is down :(") } else { println("JsonSyntaxException at getJSONResponse '$urlString'") LorenzUtils.error("[SkyHanni] JsonSyntaxException at getJSONResponse!") |