aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-01-11 10:57:17 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-01-11 10:57:17 +0100
commit3b217b1cfc8da17fa8b0e88e7bbe153b9b0314e1 (patch)
tree8a71a814138e3aad418ebb0a9cde1ee8ea36a291 /src/main
parent27363d765f2c09bae12b059207a7bc2b1b7e3825 (diff)
downloadskyhanni-3b217b1cfc8da17fa8b0e88e7bbe153b9b0314e1.tar.gz
skyhanni-3b217b1cfc8da17fa8b0e88e7bbe153b9b0314e1.tar.bz2
skyhanni-3b217b1cfc8da17fa8b0e88e7bbe153b9b0314e1.zip
code cleanup
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt
index bf88fb865..d8f52a641 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.nether.reputationhelper.dailykuudra
import at.hannibal2.skyhanni.config.Storage
import at.hannibal2.skyhanni.data.IslandType
import at.hannibal2.skyhanni.data.ScoreboardData
+import at.hannibal2.skyhanni.data.jsonobjects.repo.CrimsonIsleReputationJson.ReputationQuest
import at.hannibal2.skyhanni.events.LorenzChatEvent
import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
import at.hannibal2.skyhanni.features.nether.reputationhelper.CrimsonIsleReputationHelper
@@ -13,7 +14,6 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
import at.hannibal2.skyhanni.utils.LorenzVec
import at.hannibal2.skyhanni.utils.NEUItems
import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
-import at.hannibal2.skyhanni.data.jsonobjects.repo.CrimsonIsleReputationJson.ReputationQuest
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
class DailyKuudraBossHelper(private val reputationHelper: CrimsonIsleReputationHelper) {
@@ -38,8 +38,7 @@ class DailyKuudraBossHelper(private val reputationHelper: CrimsonIsleReputationH
@SubscribeEvent
fun onChat(event: LorenzChatEvent) {
- if (!LorenzUtils.inSkyBlock) return
- if (LorenzUtils.skyBlockIsland != IslandType.KUUDRA_ARENA) return
+ if (!LorenzUtils.inKuudraFight) return
if (!reputationHelper.config.enabled) return
val message = event.message
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index ce3c07d90..c4c2dfa93 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -62,7 +62,7 @@ object LorenzUtils {
val skyBlockArea get() = if (inSkyBlock) HypixelData.skyBlockArea else "?"
- val inKuudraFight get() = skyBlockIsland == IslandType.KUUDRA_ARENA
+ val inKuudraFight get() = IslandType.KUUDRA_ARENA.isInIsland()
val noTradeMode get() = HypixelData.noTrade