From de0c4f2fe5f541985f16dba230d87582bd2951eb Mon Sep 17 00:00:00 2001
From: Hondacrx <prelude_20032002@yahoo.com>
Date: Mon, 2 Jun 2025 15:48:10 -0400
Subject: [PATCH] Core/Network: Simplify worldserver port configuration:
 removed InstanceServerPort

Port From (https://github.com/TrinityCore/TrinityCore/commit/039acb20e4c218757d6b9fc441dc2da6820dafd1)
---
 Source/Framework/Constants/SharedConst.cs    |  1 -
 Source/Game/Networking/WorldSocket.cs        |  3 ++-
 Source/Game/Networking/WorldSocketManager.cs | 12 ------------
 Source/Game/Server/WorldConfig.cs            |  7 -------
 Source/Game/Server/WorldSession.cs           |  2 +-
 Source/WorldServer/WorldServer.conf.dist     |  7 -------
 6 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/Source/Framework/Constants/SharedConst.cs b/Source/Framework/Constants/SharedConst.cs
index 1e9713842..30ae16f5e 100644
--- a/Source/Framework/Constants/SharedConst.cs
+++ b/Source/Framework/Constants/SharedConst.cs
@@ -1729,7 +1729,6 @@ namespace Framework.Constants
         PdumpNoPaths,
         PersistentCharacterCleanFlags,
         PlayerAllowCommands,
-        PortInstance,
         PortWorld,
         PreserveCustomChannelDuration,
         PreserveCustomChannelInterval,
diff --git a/Source/Game/Networking/WorldSocket.cs b/Source/Game/Networking/WorldSocket.cs
index fa541e983..768464444 100644
--- a/Source/Game/Networking/WorldSocket.cs
+++ b/Source/Game/Networking/WorldSocket.cs
@@ -57,7 +57,6 @@ namespace Game.Networking
         public WorldSocket(Socket socket) : base(socket)
         {
             _connectType = ConnectionType.Realm;
-            _serverChallenge = Array.Empty<byte>().GenerateRandomKey(32);
             _worldCrypt = new WorldCrypt();
 
             _encryptKey = new byte[32];
@@ -448,6 +447,8 @@ namespace Game.Networking
 
         void HandleSendAuthSession()
         {
+            _serverChallenge = Array.Empty<byte>().GenerateRandomKey(32);
+
             AuthChallenge challenge = new();
             challenge.Challenge = _serverChallenge;
             challenge.DosChallenge = new byte[32].GenerateRandomKey(32);
diff --git a/Source/Game/Networking/WorldSocketManager.cs b/Source/Game/Networking/WorldSocketManager.cs
index 3c90b121c..1f17cefaa 100644
--- a/Source/Game/Networking/WorldSocketManager.cs
+++ b/Source/Game/Networking/WorldSocketManager.cs
@@ -24,25 +24,14 @@ namespace Game.Networking
             if (!base.StartNetwork(bindIp, port, threadCount))
                 return false;
 
-            _instanceAcceptor = new AsyncAcceptor();
-            if (!_instanceAcceptor.Start(bindIp, WorldConfig.GetIntValue(WorldCfg.PortInstance)))
-            {
-                Log.outError(LogFilter.Network, "StartNetwork failed to start instance AsyncAcceptor");
-                return false;
-            }
-
             Acceptor.AsyncAcceptSocket(OnSocketAccept);
-            _instanceAcceptor.AsyncAcceptSocket(OnSocketOpen);
 
             return true;
         }
 
         public override void StopNetwork()
         {
-            _instanceAcceptor.Close();
             base.StopNetwork();
-
-            _instanceAcceptor = null;
         }
 
         public override void OnSocketOpen(Socket sock)
@@ -70,7 +59,6 @@ namespace Game.Networking
             Global.WorldSocketMgr.OnSocketOpen(sock);
         }
 
-        AsyncAcceptor _instanceAcceptor;
         int _socketSendBufferSize;
         bool _tcpNoDelay;
     }
diff --git a/Source/Game/Server/WorldConfig.cs b/Source/Game/Server/WorldConfig.cs
index d14309a32..41982d40a 100644
--- a/Source/Game/Server/WorldConfig.cs
+++ b/Source/Game/Server/WorldConfig.cs
@@ -259,16 +259,9 @@ namespace Game
                 int val = GetDefaultValue("WorldServerPort", 8085);
                 if (val != (int)Values[WorldCfg.PortWorld])
                     Log.outError(LogFilter.ServerLoading, "WorldServerPort option can't be changed at worldserver.conf reload, using current value ({0}).", Values[WorldCfg.PortWorld]);
-
-                val = GetDefaultValue("InstanceServerPort", 8086);
-                if (val != (int)Values[WorldCfg.PortInstance])
-                    Log.outError(LogFilter.ServerLoading, "InstanceServerPort option can't be changed at worldserver.conf reload, using current value ({0}).", Values[WorldCfg.PortInstance]);
             }
             else
-            {
                 Values[WorldCfg.PortWorld] = GetDefaultValue("WorldServerPort", 8085);
-                Values[WorldCfg.PortInstance] = GetDefaultValue("InstanceServerPort", 8086);
-            }
 
             // Config values are in "milliseconds" but we handle SocketTimeOut only as "seconds" so divide by 1000
             Values[WorldCfg.SocketTimeoutTime] = GetDefaultValue("SocketTimeOutTime", 900000) / 1000;
diff --git a/Source/Game/Server/WorldSession.cs b/Source/Game/Server/WorldSession.cs
index a4c33d46c..796686368 100644
--- a/Source/Game/Server/WorldSession.cs
+++ b/Source/Game/Server/WorldSession.cs
@@ -492,7 +492,7 @@ namespace Game
             ConnectTo connectTo = new();
             connectTo.Key = _instanceConnectKey.Raw;
             connectTo.Serial = serial;
-            connectTo.Payload.Port = (ushort)WorldConfig.GetIntValue(WorldCfg.PortInstance);
+            connectTo.Payload.Port = (ushort)WorldConfig.GetIntValue(WorldCfg.PortWorld);
             connectTo.Con = (byte)ConnectionType.Instance;
 
             if (instanceAddress != null)
diff --git a/Source/WorldServer/WorldServer.conf.dist b/Source/WorldServer/WorldServer.conf.dist
index ab62d8931..19306ce38 100644
--- a/Source/WorldServer/WorldServer.conf.dist
+++ b/Source/WorldServer/WorldServer.conf.dist
@@ -81,13 +81,6 @@ HotfixDatabaseInfo.SSL = false
 
 WorldServerPort = 8085
 
-#
-#    InstanceServerPort
-#        Description: TCP port to for second world connection.
-#        Default:     8086
-
-InstanceServerPort = 8086
-
 #
 #    BindIP
 #        Description: Bind world server to IP/hostname.