2 files changed, 9 insertions, 4 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java
index 9e339b3c..c916a5e4 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java
@@ -367,8 +367,7 @@ public class DungeonSecrets {
 
     public static boolean markSecrets(int secretIndex, boolean found) {
         if (isCurrentRoomMatched()) {
-            currentRoom.markSecrets(secretIndex, found);
-            return true;
+            return currentRoom.markSecrets(secretIndex, found);
         }
         return false;
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java
index 3a03e9ee..fc62150c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java
@@ -400,8 +400,14 @@ public class Room {
         DungeonSecrets.LOGGER.info(msg, args);
     }
 
-    protected void markSecrets(int secretIndex, boolean found) {
-        secretWaypoints.row(secretIndex).values().forEach(found ? SecretWaypoint::setFound : SecretWaypoint::setMissing);
+    protected boolean markSecrets(int secretIndex, boolean found) {
+        Map<BlockPos, SecretWaypoint> secret = secretWaypoints.row(secretIndex);
+        if (secret.isEmpty()) {
+            return false;
+        } else {
+            secret.values().forEach(found ? SecretWaypoint::setFound : SecretWaypoint::setMissing);
+            return true;
+        }
     }
 
     public enum Type {