From 1f3a900e61772a0b8807bf91234ed5c5381d1bd5 Mon Sep 17 00:00:00 2001 From: Business Goose Date: Tue, 29 Mar 2022 22:26:12 +0100 Subject: [PATCH] Sanitize join & leave usernames --- .../TotalFreedomMod/listener/PlayerListener.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/listener/PlayerListener.java b/src/main/java/me/StevenLawson/TotalFreedomMod/listener/PlayerListener.java index 39ef933..ecece22 100644 --- a/src/main/java/me/StevenLawson/TotalFreedomMod/listener/PlayerListener.java +++ b/src/main/java/me/StevenLawson/TotalFreedomMod/listener/PlayerListener.java @@ -756,7 +756,7 @@ public class PlayerListener implements Listener { } if (PlayerList.existsEntry(player)) { - DiscordBridge.transmitMessage(String.format("**%s left the server**", player.getDisplayName())); + DiscordBridge.transmitMessage(String.format("**%s left the server**", DiscordBridge.sanitizeMessage(player.getDisplayName()))); } PlayerList.removeEntry(player); @@ -771,6 +771,7 @@ public class PlayerListener implements Listener { final String ip = Utilities.getIp(player); final Player playerEntry; Log.info("[JOIN] " + Utilities.formatPlayer(player) + " joined the game with IP address: " + ip, true); + // Check absolute value to account for negatives if (Math.abs(player.getLocation().getX()) >= MAX_XY_COORD || Math.abs(player.getLocation().getZ()) >= MAX_XY_COORD) { @@ -907,7 +908,7 @@ public class PlayerListener implements Listener { PlayerData.getPlayerData(player).setTag(playerTag); } } - DiscordBridge.transmitMessage(String.format("**%s joined the server**", player.getDisplayName())); + DiscordBridge.transmitMessage(String.format("**%s joined the server**", DiscordBridge.sanitizeMessage(player.getDisplayName()))); } @EventHandler(priority = EventPriority.HIGHEST)