From 5bb91104d3275283d7479f0b35c1b18be470d632 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Tue, 31 Oct 2023 01:08:28 -0400
Subject: Player Secrets Tracker (#394)

* Player Secrets Tracker

* Refactor SecretsTracker

---------

Co-authored-by: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
---
 src/main/java/de/hysky/skyblocker/utils/Utils.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/utils/Utils.java')

diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java
index b1a347f9..71e08865 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Utils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java
@@ -33,10 +33,10 @@ import java.util.List;
 public class Utils {
     private static final Logger LOGGER = LoggerFactory.getLogger(Utils.class);
     private static final String ALTERNATE_HYPIXEL_ADDRESS = System.getProperty("skyblocker.alternateHypixelAddress", "");
+    private static final String DUNGEONS_LOCATION = "dungeon";
     private static final String PROFILE_PREFIX = "Profile: ";
     private static boolean isOnHypixel = false;
     private static boolean isOnSkyblock = false;
-    private static boolean isInDungeons = false;
     private static boolean isInjected = false;
     /**
      * The profile name parsed from the player list.
@@ -79,7 +79,7 @@ public class Utils {
     }
 
     public static boolean isInDungeons() {
-        return isInDungeons;
+        return getLocationRaw().equals(DUNGEONS_LOCATION) || FabricLoader.getInstance().isDevelopmentEnvironment();
     }
 
     public static boolean isInTheRift() {
@@ -164,7 +164,6 @@ public class Utils {
                 sidebar = Collections.emptyList();
             } else {
                 isOnSkyblock = false;
-                isInDungeons = false;
                 return;
             }
         }
@@ -188,7 +187,6 @@ public class Utils {
             } else {
                 onLeaveSkyblock();
             }
-            isInDungeons = fabricLoader.isDevelopmentEnvironment() || isOnSkyblock && string.contains("The Catacombs");
         } else if (isOnHypixel) {
             isOnHypixel = false;
             onLeaveSkyblock();
@@ -205,7 +203,6 @@ public class Utils {
     private static void onLeaveSkyblock() {
         if (isOnSkyblock) {
             isOnSkyblock = false;
-            isInDungeons = false;
             SkyblockEvents.LEAVE.invoker().onSkyblockLeave();
         }
     }
-- 
cgit