coral/Sentinel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed return statements that broke the chat event

Browse Source
This commit is contained in:
trouper
2023-09-10 17:44:19 -05:00
parent 97d395a750
commit c71b42b72f
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/io/github/thetrouper/sentinel/commands/SentinelCommand.java
View File

@@ -50,5 +50,6 @@ public class SentinelCommand extends CustomCommand {
public void registerCompletions(CompletionBuilder builder) {
builder.addCompletion(1,"debugmode");
builder.addCompletion(1,"testantiswear");
}
}

12
src/main/java/io/github/thetrouper/sentinel/events/ChatEvent.java
View File

@@ -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;
}
}
}

2
src/main/java/io/github/thetrouper/sentinel/server/functions/Message.java
View File

@@ -20,7 +20,9 @@ public class Message {
public static void messagePlayer(Player sender, Player receiver, String message) {
HashSet<Player> 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);

17
src/main/java/io/github/thetrouper/sentinel/server/functions/Telemetry.java
View File

@@ -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 {