From 655a52b28d08f487071648dfb5b5beb708702648 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Sat, 18 Jan 2025 15:31:43 +0700 Subject: [PATCH] fix: i forgot the previous commit will actually make all filter systems useless. i ended up doing something else lazy instead to fix this --- build-number.txt | 2 +- .../chomens_bot/plugins/FilterManagerPlugin.java | 8 ++++++++ .../me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java | 5 ----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build-number.txt b/build-number.txt index b6e87173..c4176e46 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -1484 \ No newline at end of file +1485 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java index 83ef4d62..9267d472 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java @@ -7,6 +7,7 @@ import me.chayapak1.chomens_bot.util.ComponentUtilities; import me.chayapak1.chomens_bot.util.UUIDUtilities; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.tuple.Pair; +import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent; import java.util.Collections; import java.util.HashMap; @@ -24,6 +25,13 @@ public class FilterManagerPlugin extends PlayersPlugin.Listener { bot.players.addListener(this); + bot.addListener(new Bot.Listener() { + @Override + public void disconnected(DisconnectedEvent event) { + list.clear(); + } + }); + bot.chat.addListener(new ChatPlugin.Listener() { @Override public boolean playerMessageReceived(PlayerMessage message) { diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java index 6588625e..9dbd8653 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java @@ -143,11 +143,6 @@ public class IPFilterPlugin extends PlayersPlugin.Listener { } private void handleFilterManager (String ip, PlayerEntry entry) { - // this can break other filters for this player (if they are filtered) - // but for now it will fix a case when someone removes an ip and that - // player will still get filtered - if (!localList.contains(ip)) bot.filterManager.remove(entry.profile.getName()); - for (String eachIP : localList) { if (!eachIP.equals(ip)) continue;