diff options
| author | My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> | 2021-09-18 16:35:02 -0400 |
|---|---|---|
| committer | My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> | 2021-09-18 16:35:02 -0400 |
| commit | d7389d403ec31b5e23ac8c5fc0edd5359d32d582 (patch) | |
| tree | 64151d89142cdf128249d3cd212f8634b684c1e3 /src/main | |
| parent | f9226946737829db33920fb0695e80e42347fa2d (diff) | |
| download | SkytilsMod-d7389d403ec31b5e23ac8c5fc0edd5359d32d582.tar.gz SkytilsMod-d7389d403ec31b5e23ac8c5fc0edd5359d32d582.tar.bz2 SkytilsMod-d7389d403ec31b5e23ac8c5fc0edd5359d32d582.zip | |
simplify spamhider
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/kotlin/skytils/skytilsmod/features/impl/handlers/SpamHider.kt | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/main/kotlin/skytils/skytilsmod/features/impl/handlers/SpamHider.kt b/src/main/kotlin/skytils/skytilsmod/features/impl/handlers/SpamHider.kt index 04289f43..42f8e04f 100644 --- a/src/main/kotlin/skytils/skytilsmod/features/impl/handlers/SpamHider.kt +++ b/src/main/kotlin/skytils/skytilsmod/features/impl/handlers/SpamHider.kt @@ -222,21 +222,9 @@ class SpamHider : PersistentSave(File(Skytils.modDir, "spamhider.json")) { } } - filters.forEach { - if (it.skyblockOnly && !Utils.inSkyblock) return@forEach - if (it.check(if (it.formatted) formatted else unformatted) && it.state > 0) { - cancelChatPacket(event, it.state == 2) - return - } - } - - repoFilters.forEach { - if (it.skyblockOnly && !Utils.inSkyblock) return@forEach - if (it.check(if (it.formatted) formatted else unformatted) && it.state > 0) { - cancelChatPacket(event, it.state == 2) - return - } - } + if (filters.any { + checkFilter(it, formatted, unformatted, event) + } || repoFilters.any { checkFilter(it, formatted, unformatted, event) }) return if (!Utils.inSkyblock) return try { @@ -655,6 +643,15 @@ class SpamHider : PersistentSave(File(Skytils.modDir, "spamhider.json")) { } } + private fun checkFilter(filter: Filter, formatted: String, unformatted: String, event: ReceiveEvent): Boolean { + if (filter.skyblockOnly && !Utils.inSkyblock) return false + if (filter.check(if (filter.formatted) formatted else unformatted) && filter.state > 0) { + cancelChatPacket(event, filter.state == 2) + return true + } + return false + } + class SpamMessage(var message: String, var time: Long, var height: Double) class SpamGuiElement : GuiElement("Spam Gui", 1.0f, FloatPair(0.65f, 0.925f)) { /** |