From 039acb20e4c218757d6b9fc441dc2da6820dafd1 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 7 Jan 2025 13:41:09 +0100 Subject: Core/Network: Simplify worldserver port configuration: removed InstanceServerPort --- src/server/worldserver/Main.cpp | 3 +-- src/server/worldserver/worldserver.conf.dist | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'src/server/worldserver') 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 d9b5aed1c80..a4f983df6a9 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -166,13 +166,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. -- cgit v1.2.3