From c2e4d2939dad5569b223e3b021a39f3edfeb7f6b Mon Sep 17 00:00:00 2001 From: Business Goose Date: Tue, 29 Mar 2022 23:06:33 +0100 Subject: [PATCH] Move IP on join from prelogin event to join event --- .../java/me/StevenLawson/TotalFreedomMod/Server.java | 12 ------------ .../TotalFreedomMod/listener/PlayerListener.java | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/Server.java b/src/main/java/me/StevenLawson/TotalFreedomMod/Server.java index cc1fd8d..a6c1b4f 100644 --- a/src/main/java/me/StevenLawson/TotalFreedomMod/Server.java +++ b/src/main/java/me/StevenLawson/TotalFreedomMod/Server.java @@ -82,18 +82,6 @@ public class Server { final String ip = event.getAddress().getHostAddress().trim(); final boolean isAdmin = AdminList.isSuperAdminSafe(null, ip); - TextComponent textComponent = new TextComponent(String.format("%s is attempting to join with IP %s.", event.getName(), Utilities.getFuzzyIp(ip))); - textComponent.setColor(ChatColor.GRAY.asBungee()); - - for (org.bukkit.entity.Player player : Bukkit.getOnlinePlayers()) - { - if (AdminList.isSuperAdmin(player)) - { - player.spigot().sendMessage(textComponent); - } - } - - DiscordBridge.transmitAdminMessage(textComponent.getText()); // Check if the player is already online for (Player onlinePlayer : TotalFreedomMod.server.getOnlinePlayers()) diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/listener/PlayerListener.java b/src/main/java/me/StevenLawson/TotalFreedomMod/listener/PlayerListener.java index f7ffa17..7db8523 100644 --- a/src/main/java/me/StevenLawson/TotalFreedomMod/listener/PlayerListener.java +++ b/src/main/java/me/StevenLawson/TotalFreedomMod/listener/PlayerListener.java @@ -774,6 +774,18 @@ 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); + TextComponent textComponent = new TextComponent(String.format("%s is joining with IP %s.", player.getName(), Utilities.getFuzzyIp(ip))); + textComponent.setColor(ChatColor.GRAY.asBungee()); + + for (org.bukkit.entity.Player onlinePlayer : Bukkit.getOnlinePlayers()) + { + if (AdminList.isSuperAdmin(player)) + { + onlinePlayer.spigot().sendMessage(textComponent); + } + } + + DiscordBridge.transmitAdminMessage(textComponent.getText()); // Check absolute value to account for negatives if (Math.abs(player.getLocation().getX()) >= MAX_XY_COORD || Math.abs(player.getLocation().getZ()) >= MAX_XY_COORD)