From 761952420f1cf9896bd69a534a338d64658bab59 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Sun, 27 Aug 2023 13:59:46 +0800 Subject: Update markSecrets --- .../skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java | 3 +-- .../me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/Room.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock') 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 secret = secretWaypoints.row(secretIndex); + if (secret.isEmpty()) { + return false; + } else { + secret.values().forEach(found ? SecretWaypoint::setFound : SecretWaypoint::setMissing); + return true; + } } public enum Type { -- cgit