From 7adb25888f8b43b4be53efb5db2646819315becb Mon Sep 17 00:00:00 2001
From: Arnah <github@arnah.ca>
Date: Wed, 16 Aug 2023 00:53:40 -0600
Subject: [PATCH 1/2] Stop masking ip address when connecting locally

---
 src/main/java/client/Client.java                       |  6 +-----
 src/main/java/net/netty/ServerChannelInitializer.java  |  6 +-----
 .../net/server/coordinator/session/IpAddresses.java    | 10 ----------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/main/java/client/Client.java b/src/main/java/client/Client.java
index b929ff035a..edeea33ba8 100644
--- a/src/main/java/client/Client.java
+++ b/src/main/java/client/Client.java
@@ -39,7 +39,6 @@ import net.server.Server;
 import net.server.channel.Channel;
 import net.server.coordinator.login.LoginBypassCoordinator;
 import net.server.coordinator.session.Hwid;
-import net.server.coordinator.session.IpAddresses;
 import net.server.coordinator.session.SessionCoordinator;
 import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult;
 import net.server.guild.Guild;
@@ -176,10 +175,7 @@ public class Client extends ChannelInboundHandlerAdapter {
     private static String getRemoteAddress(io.netty.channel.Channel channel) {
         String remoteAddress = "null";
         try {
-            String hostAddress = ((InetSocketAddress) channel.remoteAddress()).getAddress().getHostAddress();
-            if (hostAddress != null) {
-                remoteAddress = IpAddresses.evaluateRemoteAddress(hostAddress); // thanks dyz for noticing Local/LAN/WAN connections not interacting properly
-            }
+            remoteAddress = ((InetSocketAddress) channel.remoteAddress()).getAddress().getHostAddress();
         } catch (NullPointerException npe) {
             log.warn("Unable to get remote address for client", npe);
         }
diff --git a/src/main/java/net/netty/ServerChannelInitializer.java b/src/main/java/net/netty/ServerChannelInitializer.java
index 874e84d1a6..4ecc65a592 100644
--- a/src/main/java/net/netty/ServerChannelInitializer.java
+++ b/src/main/java/net/netty/ServerChannelInitializer.java
@@ -15,7 +15,6 @@ import net.encryption.InitializationVector;
 import net.encryption.PacketCodec;
 import net.packet.logging.InPacketLogger;
 import net.packet.logging.OutPacketLogger;
-import net.server.coordinator.session.IpAddresses;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import tools.PacketCreator;
@@ -35,10 +34,7 @@ public abstract class ServerChannelInitializer extends ChannelInitializer<Socket
     String getRemoteAddress(Channel channel) {
         String remoteAddress = "null";
         try {
-            String hostAddress = ((InetSocketAddress) channel.remoteAddress()).getAddress().getHostAddress();
-            if (hostAddress != null) {
-                remoteAddress = IpAddresses.evaluateRemoteAddress(hostAddress); // thanks dyz for noticing Local/LAN/WAN connections not interacting properly
-            }
+            remoteAddress = ((InetSocketAddress) channel.remoteAddress()).getAddress().getHostAddress();
         } catch (NullPointerException npe) {
             log.warn("Unable to get remote address from netty Channel: {}", channel, npe);
         }
diff --git a/src/main/java/net/server/coordinator/session/IpAddresses.java b/src/main/java/net/server/coordinator/session/IpAddresses.java
index 16d551f6e5..13ca658f4a 100644
--- a/src/main/java/net/server/coordinator/session/IpAddresses.java
+++ b/src/main/java/net/server/coordinator/session/IpAddresses.java
@@ -1,7 +1,5 @@
 package net.server.coordinator.session;
 
-import config.YamlConfig;
-
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -16,14 +14,6 @@ public class IpAddresses {
                 .collect(Collectors.toList());
     }
 
-    public static String evaluateRemoteAddress(String inetAddress) {
-        if (isLocalAddress(inetAddress) || isLanAddress(inetAddress)) {
-            return YamlConfig.config.server.HOST;
-        } else {
-            return inetAddress;
-        }
-    }
-
     public static boolean isLocalAddress(String inetAddress) {
         return inetAddress.startsWith("127.");
     }

From 2d7525f2b495878df8e81cc47b3bc06171faa864 Mon Sep 17 00:00:00 2001
From: Arnah <github@arnah.ca>
Date: Wed, 16 Aug 2023 16:19:16 -0600
Subject: [PATCH 2/2] Fix cashshop exiting not using proper ip

---
 .../java/net/server/channel/handlers/ChangeMapHandler.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/server/channel/handlers/ChangeMapHandler.java b/src/main/java/net/server/channel/handlers/ChangeMapHandler.java
index 9a8648735a..29778a9fb3 100644
--- a/src/main/java/net/server/channel/handlers/ChangeMapHandler.java
+++ b/src/main/java/net/server/channel/handlers/ChangeMapHandler.java
@@ -29,6 +29,7 @@ import constants.id.ItemId;
 import constants.id.MapId;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
+import net.server.Server;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import server.Trade;
@@ -181,7 +182,11 @@ public final class ChangeMapHandler extends AbstractPacketHandler {
             c.disconnect(false, false);
             return;
         }
-        String[] socket = c.getChannelServer().getIP().split(":");
+        String[] socket = Server.getInstance().getInetSocket(c, c.getWorld(), c.getChannel());
+        if (socket == null) {
+            c.enableCSActions();
+            return;
+        }
         chr.getCashShop().open(false);
 
         chr.setSessionTransitionState();