From e26273f950e292bcfe127a1101306218a2c5e2a2 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 17 Oct 2023 11:50:05 +0200
Subject: code cleanup

---
 src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt  | 2 +-
 .../skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt      | 2 +-
 .../at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt    | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/main/java/at')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt
index 618265f5a..99795274c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt
@@ -15,5 +15,5 @@ object DianaAPI {
 
     fun hasGriffinPet() = ProfileStorageData.profileSpecific?.currentPet?.contains("Griffin") ?: false
 
-    fun featuresEnabled() = isRitualActive() && IslandType.HUB.isInIsland()
+    fun featuresEnabled() = IslandType.HUB.isInIsland() && isRitualActive()
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
index deb24b5e8..dcc0e9593 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
@@ -97,8 +97,8 @@ class GriffinBurrowParticleFinder {
 
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
-        if (!config.burrowsSoopyGuess) return
         if (!DianaAPI.featuresEnabled()) return
+        if (!config.burrowsSoopyGuess) return
         val message = event.message
         if (message.startsWith("§eYou dug out a Griffin Burrow!") ||
             message == "§eYou finished the Griffin burrow chain! §r§7(4/4)"
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
index 30dc6bcc3..c994033dd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
@@ -280,7 +280,5 @@ class SoopyGuessBurrow {
         }
     }
 
-    private fun isEnabled(): Boolean {
-        return DianaAPI.featuresEnabled() && SkyHanniMod.feature.event.diana.burrowsSoopyGuess
-    }
+    private fun isEnabled() = DianaAPI.featuresEnabled() && SkyHanniMod.feature.event.diana.burrowsSoopyGuess
 }
\ No newline at end of file
-- 
cgit