From 84589e27e919acd6f8972bb053e209b175950cfc Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Thu, 7 Mar 2024 01:20:43 +0100
Subject: Interlal Change: Code cleanup (#1113)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt    | 2 +-
 .../java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt
index c5dde5ffb..b2530af37 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt
@@ -43,7 +43,7 @@ class CustomTextBox {
     }
 
     private fun isEnabled() =
-        config.enabled && (LorenzUtils.inSkyBlock || OutsideSbFeature.CUSTOM_TEXT_BOX.isSelected())
+        (LorenzUtils.inSkyBlock || OutsideSbFeature.CUSTOM_TEXT_BOX.isSelected()) && config.enabled
 
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
index b8a57856c..6997da51b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
@@ -106,8 +106,8 @@ class MarkedPlayerManager {
         }
     }
 
-    private fun isEnabled() =
-        config.highlightInWorld && (LorenzUtils.inSkyBlock || OutsideSbFeature.MARKED_PLAYERS.isSelected())
+    private fun isEnabled() = (LorenzUtils.inSkyBlock || OutsideSbFeature.MARKED_PLAYERS.isSelected())
+        && config.highlightInWorld
 
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
-- 
cgit