Merge branch 'tcpshield'

AuthMe · Jul 27, 2022 · bbb615b · bbb615b
2 parents 1e732d6 + 0e1774a
commit bbb615b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 deletions.
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
@@ -26,6 +26,7 @@
 package com.github.games647.fastlogin.bukkit;
 
 import com.comphenix.protocol.ProtocolLibrary;
+import com.destroystokyo.paper.event.player.PlayerHandshakeEvent;
 import com.github.games647.fastlogin.bukkit.command.CrackedCommand;
 import com.github.games647.fastlogin.bukkit.command.PremiumCommand;
 import com.github.games647.fastlogin.bukkit.listener.ConnectionListener;
@@ -56,6 +57,8 @@
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.geysermc.floodgate.api.FloodgateApi;
@@ -105,6 +108,15 @@ public void onEnable() {
         bungeeManager = new BungeeManager(this);
         bungeeManager.initialize();
 
+        // getServer().getPluginManager().registerEvents(new Listener() {
+        //
+        //     @EventHandler
+        //     void onHandshake(PlayerHandshakeEvent handshakeEvent) {
+        //         handshakeEvent.setCancelled(false);
+        //         handshakeEvent.setSocketAddressHostname("192.168.0.1");
+        //     }
+        // }, this);
+
         PluginManager pluginManager = getServer().getPluginManager();
         if (bungeeManager.isEnabled()) {
             markInitialized();

diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/AuthMeHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/AuthMeHook.java
@@ -77,7 +77,7 @@ public AuthMeHook(FastLoginBukkit plugin) {
     public void onSessionRestore(RestoreSessionEvent restoreSessionEvent) {
         Player player = restoreSessionEvent.getPlayer();
 
-        BukkitLoginSession session = plugin.getSession(player.getAddress());
+        BukkitLoginSession session = plugin.getSession(player.spigot().getRawAddress());
         if (session != null && session.isVerified()) {
             restoreSessionEvent.setCancelled(true);
         }

diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java
@@ -127,7 +127,7 @@ private void onRegisterMessage(Player player, String playerName, InetSocketAddre
 
     private void startLoginTaskIfReady(Player player, BukkitLoginSession session) {
         session.setVerified(true);
-        plugin.putSession(player.getAddress(), session);
+        plugin.putSession(player.spigot().getRawAddress(), session);
 
         // only start a new login task if the join event fired earlier. This event then didn't
         boolean result = plugin.getBungeeManager().didJoinEventFired(player);

diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java
@@ -80,7 +80,7 @@ private void delayForceLogin(Player player) {
         // session exists so the player is ready for force login
         // cases: Paper (firing BungeeCord message before PlayerJoinEvent) or not running BungeeCord and already
         // having the login session from the login process
-        BukkitLoginSession session = plugin.getSession(player.getAddress());
+        BukkitLoginSession session = plugin.getSession(player.spigot().getRawAddress());
 
         if (session == null) {
             // Floodgate players usually don't have a session at this point
@@ -95,7 +95,7 @@ private void delayForceLogin(Player player) {
                 }
             }
 
-            String sessionId = plugin.getSessionId(player.getAddress());
+            String sessionId = plugin.getSessionId(player.spigot().getRawAddress());
             plugin.getLog().info("No on-going login session for player: {} with ID {}. ", player, sessionId);
             plugin.getLog().info("Setups using Minecraft proxies will start delayed "
                 + "when the command from the proxy is received");

diff --git a/...in/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java b/...in/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java
@@ -209,7 +209,7 @@ private Object getNetworkManager() throws IllegalAccessException, ClassNotFoundE
     }
 
     private boolean enableEncryption(SecretKey loginKey) throws IllegalArgumentException {
-        plugin.getLog().info("Enabling onlinemode encryption for {}", player.getName());
+        plugin.getLog().info("Enabling onlinemode encryption for {}", player.getAddress());
         // Initialize method reflections
         if (encryptMethod == null) {
             Class<?> networkManagerClass = MinecraftReflection.getNetworkManagerClass();

diff --git a/...va/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolLoginSource.java b/...va/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolLoginSource.java
@@ -51,7 +51,7 @@ public void kick(String message) {
 
     @Override
     public InetSocketAddress getAddress() {
-        return loginStartEvent.getAddress();
+        return loginStartEvent.getConnection().getRawAddress();
     }
 
     public PlayerLoginStartEvent getLoginStartEvent() {

diff --git a/...om/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java b/...om/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java
@@ -66,7 +66,7 @@ public void onLoginStart(PlayerLoginStartEvent loginStartEvent) {
         }
 
         String username = loginStartEvent.getConnection().getProfile().getName();
-        InetSocketAddress address = loginStartEvent.getAddress();
+        InetSocketAddress address = loginStartEvent.getConnection().getRawAddress();
         plugin.getLog().info("Incoming login request for {} from {}", username, address);
 
         Action action = antiBotService.onIncomingConnection(address, username);
@@ -91,13 +91,14 @@ public void onLoginStart(PlayerLoginStartEvent loginStartEvent) {
 
     @EventHandler
     public void onConnectionClosed(ConnectionCloseEvent closeEvent) {
-        InetSocketAddress address = closeEvent.getConnection().getAddress();
+        InetSocketAddress address = closeEvent.getConnection().getRawAddress();
         plugin.removeSession(address);
     }
 
     @EventHandler
     public void onPropertiesResolve(PlayerProfileCompleteEvent profileCompleteEvent) {
-        InetSocketAddress address = profileCompleteEvent.getAddress();
+        InetSocketAddress address = profileCompleteEvent.getConnection().getRawAddress();
+
         BukkitLoginSession session = plugin.getSession(address);
 
         if (session != null && profileCompleteEvent.getConnection().getProfile().isOnlineMode()) {