aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock/dungeon
diff options
context:
space:
mode:
authorRime <81419447+Emirlol@users.noreply.github.com>2024-01-20 13:25:04 +0300
committerRime <81419447+Emirlol@users.noreply.github.com>2024-01-21 09:37:49 +0300
commitb1bfa5e0009b2a969c913e701a56b812517a0700 (patch)
tree106f1ce4a117d13c918bdfb4a441c8372d1315d7 /src/main/java/de/hysky/skyblocker/skyblock/dungeon
parentf7f8e5f0b8f9d638566e8528e1a64219b8bf40ad (diff)
downloadSkyblocker-b1bfa5e0009b2a969c913e701a56b812517a0700.tar.gz
Skyblocker-b1bfa5e0009b2a969c913e701a56b812517a0700.tar.bz2
Skyblocker-b1bfa5e0009b2a969c913e701a56b812517a0700.zip
Add death message filter and improve death regex
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/dungeon')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
index c6dbf8dc..a59d5615 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
@@ -47,7 +47,7 @@ public class DungeonScore {
private static final Pattern CRYPTS_PATTERN = Pattern.compile("Crypts: (?<crypts>\\d+)");
private static final Pattern COMPLETED_ROOMS_PATTERN = Pattern.compile(" *Completed Rooms: (?<rooms>\\d+)");
//Chat patterns
- private static final Pattern DEATHS_PATTERN = Pattern.compile(".*?\u2620 (?<whodied>\\S+) .*");
+ private static final Pattern DEATHS_PATTERN = Pattern.compile(" \\u2620 (?<whodied>\\S+) .*");
//Other patterns
private static final Pattern MIMIC_FLOORS_PATTERN = Pattern.compile("[FM][67]");
@@ -82,6 +82,10 @@ public class DungeonScore {
checkMessageForWatcher(str);
}
});
+ ClientReceiveMessageEvents.GAME_CANCELED.register((message, overlay) -> {
+ if (overlay || !Utils.isInDungeons() || !dungeonStarted) return;
+ checkMessageForDeaths(message.getString());
+ });
}
public static void tick() {