From c71b42b72fad96c95d99ee9c12a70ec6808bd81e Mon Sep 17 00:00:00 2001 From: trouper Date: Sun, 10 Sep 2023 17:44:19 -0500 Subject: [PATCH] Removed return statements that broke the chat event --- .../sentinel/commands/SentinelCommand.java | 3 ++- .../thetrouper/sentinel/events/ChatEvent.java | 12 +++++++++--- .../sentinel/server/functions/Message.java | 2 ++ .../sentinel/server/functions/Telemetry.java | 17 +++-------------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/java/io/github/thetrouper/sentinel/commands/SentinelCommand.java b/src/main/java/io/github/thetrouper/sentinel/commands/SentinelCommand.java index 4984c3a..309a420 100644 --- a/src/main/java/io/github/thetrouper/sentinel/commands/SentinelCommand.java +++ b/src/main/java/io/github/thetrouper/sentinel/commands/SentinelCommand.java @@ -49,6 +49,7 @@ public class SentinelCommand extends CustomCommand { @Override public void registerCompletions(CompletionBuilder builder) { builder.addCompletion(1,"debugmode"); - builder.addCompletion(1,"testantiswear"); + builder.addCompletion(1,"testantiswear"); + } } diff --git a/src/main/java/io/github/thetrouper/sentinel/events/ChatEvent.java b/src/main/java/io/github/thetrouper/sentinel/events/ChatEvent.java index 8d2bb45..558a883 100644 --- a/src/main/java/io/github/thetrouper/sentinel/events/ChatEvent.java +++ b/src/main/java/io/github/thetrouper/sentinel/events/ChatEvent.java @@ -5,6 +5,8 @@ import io.github.thetrouper.sentinel.data.Config; import io.github.thetrouper.sentinel.server.functions.AntiSpam; import io.github.thetrouper.sentinel.server.functions.AntiUnicode; import io.github.thetrouper.sentinel.server.functions.ProfanityFilter; +import io.github.thetrouper.sentinel.server.util.ServerUtils; +import io.github.thetrouper.sentinel.server.util.TextUtils; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerChatEvent; @@ -14,22 +16,26 @@ public class ChatEvent implements Listener { @EventHandler public static void onChat(AsyncPlayerChatEvent e) { if (e.isCancelled()) return; + ServerUtils.sendDebugMessage(TextUtils.prefix("Chat event detected!")); if (!Sentinel.isTrusted(e.getPlayer()) || !e.getPlayer().hasPermission("sentinel.chat.antiunicode.bypass")) { + ServerUtils.sendDebugMessage(TextUtils.prefix("Permission bypass failed, checking for unicode")); if (Config.antiUnicode) { + ServerUtils.sendDebugMessage(TextUtils.prefix("Enabled, Continuing unicode check!")); AntiUnicode.handleAntiUnicode(e); - return; } } if (!Sentinel.isTrusted(e.getPlayer()) || !e.getPlayer().hasPermission("sentinel.chat.antiswear.bypass")) { + ServerUtils.sendDebugMessage(TextUtils.prefix("Permission bypass failed, checking for swears")); if (Config.antiSwearEnabled) { + ServerUtils.sendDebugMessage(TextUtils.prefix("Enabled, Continuing swear check!")); ProfanityFilter.handleProfanityFilter(e); - return; } } if (!Sentinel.isTrusted(e.getPlayer()) || !e.getPlayer().hasPermission("sentinel.chat.antispam.bypass")) { + ServerUtils.sendDebugMessage(TextUtils.prefix("Permission bypass failed, checking for spam")); if (Config.antiSpamEnabled) { + ServerUtils.sendDebugMessage(TextUtils.prefix("Enabled, Continuing spam check!")); AntiSpam.handleAntiSpam(e); - return; } } } diff --git a/src/main/java/io/github/thetrouper/sentinel/server/functions/Message.java b/src/main/java/io/github/thetrouper/sentinel/server/functions/Message.java index 98f9a53..12410a8 100644 --- a/src/main/java/io/github/thetrouper/sentinel/server/functions/Message.java +++ b/src/main/java/io/github/thetrouper/sentinel/server/functions/Message.java @@ -20,7 +20,9 @@ public class Message { public static void messagePlayer(Player sender, Player receiver, String message) { HashSet receivers = new HashSet<>(); receivers.add(receiver); + receivers.add(sender); AsyncPlayerChatEvent checkEvent = new AsyncPlayerChatEvent(true,sender,message,receivers); + if (checkEvent.isCancelled()) return; if (!Sentinel.isTrusted(sender) || !sender.hasPermission("sentinel.chat.antiswear.bypass")) if (Config.antiSwearEnabled) ProfanityFilter.handleProfanityFilter(checkEvent); if (!Sentinel.isTrusted(sender) || !sender.hasPermission("sentinel.chat.antispam.bypass")) if (Config.antiSpamEnabled) AntiSpam.handleAntiSpam(checkEvent); if (!Sentinel.isTrusted(sender) || !sender.hasPermission("sentinel.chat.antiunicode.bypass")) if (Config.antiUnicode) AntiUnicode.handleAntiUnicode(checkEvent); diff --git a/src/main/java/io/github/thetrouper/sentinel/server/functions/Telemetry.java b/src/main/java/io/github/thetrouper/sentinel/server/functions/Telemetry.java index 86034df..9cb5ee2 100644 --- a/src/main/java/io/github/thetrouper/sentinel/server/functions/Telemetry.java +++ b/src/main/java/io/github/thetrouper/sentinel/server/functions/Telemetry.java @@ -1,12 +1,8 @@ package io.github.thetrouper.sentinel.server.functions; import io.github.thetrouper.sentinel.Sentinel; -import io.github.thetrouper.sentinel.data.Config; import io.github.thetrouper.sentinel.discord.DiscordWebhook; -import io.github.thetrouper.sentinel.server.util.ArrayUtils; -import javax.crypto.Cipher; -import javax.crypto.spec.SecretKeySpec; import java.awt.*; import java.io.BufferedReader; import java.io.IOException; @@ -14,17 +10,10 @@ import java.io.InputStreamReader; import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; -import java.util.*; -import java.security.KeyManagementException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; +import java.util.Map; public class Telemetry {