diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-01-07 13:41:09 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2025-01-09 20:53:27 +0100 |
| commit | 40696d4754880d9a4f76d46c83728c4ce52a24f2 (patch) | |
| tree | ae8c75649a890d332499c8bfcaeb44fda387b2e1 /src/server/worldserver | |
| parent | bceca01ce57f13be0a3597c1852f4e7e4a8084d5 (diff) | |
Core/Network: Simplify worldserver port configuration: removed InstanceServerPort
(cherry picked from commit 039acb20e4c218757d6b9fc441dc2da6820dafd1)
Diffstat (limited to 'src/server/worldserver')
| -rw-r--r-- | src/server/worldserver/Main.cpp | 3 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 1fe898e6c1b..a482d109890 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -388,7 +388,6 @@ int main(int argc, char** argv) // Launch the worldserver listener socket uint16 worldPort = uint16(sWorld->getIntConfig(CONFIG_PORT_WORLD)); - uint16 instancePort = uint16(sWorld->getIntConfig(CONFIG_PORT_INSTANCE)); std::string worldListener = sConfigMgr->GetStringDefault("BindIP", "0.0.0.0"); int networkThreads = sConfigMgr->GetIntDefault("Network.Threads", 1); @@ -400,7 +399,7 @@ int main(int argc, char** argv) return 1; } - if (!sWorldSocketMgr.StartWorldNetwork(*ioContext, worldListener, worldPort, instancePort, networkThreads)) + if (!sWorldSocketMgr.StartNetwork(*ioContext, worldListener, worldPort, networkThreads)) { TC_LOG_ERROR("server.worldserver", "Failed to initialize network"); World::StopNow(ERROR_EXIT_CODE); diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 46c3bf6bc7f..800529d753c 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -167,13 +167,6 @@ MaxPingTime = 30 WorldServerPort = 8085 # -# InstanceServerPort -# Description: TCP port to for second world connection. -# Default: 8086 - -InstanceServerPort = 8086 - -# # BindIP # Description: Bind world server to IP/hostname. # Using IPv6 address (such as "::") will enable both IPv4 and IPv6 connections |
