diff options
| author | NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com> | 2023-05-28 03:20:19 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-27 19:20:19 +0200 |
| commit | 15a05d39cabf4dd8a7ecc8a4328a2d0dec6d2111 (patch) | |
| tree | a9e0da8e807c49ba45de92bc2f584dfc6ece1e89 | |
| parent | 009c6cca93f0b8ee3dbc81a2929867c673d96f4f (diff) | |
| download | NotEnoughUpdates-15a05d39cabf4dd8a7ecc8a4328a2d0dec6d2111.tar.gz NotEnoughUpdates-15a05d39cabf4dd8a7ecc8a4328a2d0dec6d2111.tar.bz2 NotEnoughUpdates-15a05d39cabf4dd8a7ecc8a4328a2d0dec6d2111.zip | |
Fixed slayer overlay (#701)
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java | 5 | ||||
| -rw-r--r-- | src/main/kotlin/io/github/moulberry/notenoughupdates/util/SidebarUtil.kt | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java index 8de320d0..14a4d828 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java @@ -375,6 +375,7 @@ public class SBInfo { boolean containsStranded = false; boolean containsBingo = false; for (String line : lines) { //Slayer stuff + line = SidebarUtil.cleanTeamName(line); if (line.contains("Tarantula Broodfather")) { slayer = "Tarantula"; } else if (line.contains("Revenant Horror")) { @@ -386,8 +387,8 @@ public class SBInfo { } else if (line.contains("Inferno Demonlord")) { slayer = "Blaze"; } - if (lines.contains("Slayer Quest") && SlayerOverlay.unloadOverlayTimer == -1 || - lines.contains("Slayer Quest") && System.currentTimeMillis() - SlayerOverlay.unloadOverlayTimer > 500) { + if (line.contains("Slayer Quest") && SlayerOverlay.unloadOverlayTimer == -1 || + line.contains("Slayer Quest") && System.currentTimeMillis() - SlayerOverlay.unloadOverlayTimer > 500) { SlayerOverlay.slayerQuest = true; } if (SlayerOverlay.slayerQuest) { diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/util/SidebarUtil.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/util/SidebarUtil.kt index 503085f0..d51c2ea9 100644 --- a/src/main/kotlin/io/github/moulberry/notenoughupdates/util/SidebarUtil.kt +++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/util/SidebarUtil.kt @@ -29,14 +29,15 @@ object SidebarUtil { fun readSidebarLines(cleanColor: Boolean = true, cleanSpecialCharacters: Boolean = true): List<String> { var result = readRawSidebarLines() if (cleanColor) result = result.map { Utils.cleanColour(it) } - if (cleanSpecialCharacters) result.map { cleanSB(it) } + if (cleanSpecialCharacters) result.map { cleanTeamName(it) } return result } @JvmStatic fun readRawSidebarLines() = fetchScoreboardLines().reversed() - private fun cleanSB(scoreboard: String) = + @JvmStatic + fun cleanTeamName(scoreboard: String) = scoreboard.toCharArray().filter { it.code in 21..126 || it.code == 167 }.joinToString(separator = "") private fun fetchScoreboardLines(): List<String> { |