summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2015-10-15 13:04:15 -0400
committerSmallJoker <mk939@ymail.com>2017-03-18 12:37:57 +0100
commitb8484ef24e8e1ec90a2967372808ab2bea538c7c (patch)
treec70672297abb589b472f155421ac19a1f95de0e3 /src/main.cpp
parent2cc518dcaffd345c498f671354b3dd504f2f4195 (diff)
downloadminetest-b8484ef24e8e1ec90a2967372808ab2bea538c7c.tar.gz
minetest-b8484ef24e8e1ec90a2967372808ab2bea538c7c.tar.bz2
minetest-b8484ef24e8e1ec90a2967372808ab2bea538c7c.zip
Server list cleanup
This removes the hacky server_dedicated pseudo-setting.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/main.cpp b/src/main.cpp
index a54454653..3599a36ce 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -213,10 +213,6 @@ int main(int argc, char *argv[])
infostream << "Using commanded world path ["
<< game_params.world_path << "]" << std::endl;
- //Run dedicated server if asked to or no other option
- g_settings->set("server_dedicated",
- game_params.is_dedicated_server ? "true" : "false");
-
if (game_params.is_dedicated_server)
return run_dedicated_server(game_params, cmd_args) ? 0 : 1;
@@ -852,8 +848,8 @@ static bool run_dedicated_server(const GameParams &game_params, const Settings &
try {
// Create server
- Server server(game_params.world_path,
- game_params.game_spec, false, bind_addr.isIPv6(), &iface);
+ Server server(game_params.world_path, game_params.game_spec,
+ false, bind_addr.isIPv6(), true, &iface);
g_term_console.setup(&iface, &kill, admin_nick);
@@ -887,7 +883,7 @@ static bool run_dedicated_server(const GameParams &game_params, const Settings &
try {
// Create server
Server server(game_params.world_path, game_params.game_spec, false,
- bind_addr.isIPv6());
+ bind_addr.isIPv6(), true);
server.start(bind_addr);
// Run server