summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-10-19 19:34:47 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-10-19 19:34:47 +0300
commitb6fcbc5fbaba4a7faa65f792b16e47a405fa4ebf (patch)
treeae56446af5004475d2d9a5081b33c682825f4ffd
parented870a7237ceb60e380184b674088d7f1b9c4fb8 (diff)
downloadminetest-b6fcbc5fbaba4a7faa65f792b16e47a405fa4ebf.tar.gz
minetest-b6fcbc5fbaba4a7faa65f792b16e47a405fa4ebf.tar.bz2
minetest-b6fcbc5fbaba4a7faa65f792b16e47a405fa4ebf.zip
Default max_simultaneous_block_sends_server_total to 2 to make network not cough too much on the fixed block sending code
-rw-r--r--minetest.conf.example2
-rw-r--r--src/defaultsettings.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/minetest.conf.example b/minetest.conf.example
index 30adc5e60..01b3f3e7c 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -142,7 +142,7 @@
#active_object_send_range_blocks = 3
#active_block_range = 2
#max_simultaneous_block_sends_per_client = 2
-#max_simultaneous_block_sends_server_total = 8
+#max_simultaneous_block_sends_server_total = 2
#max_block_send_distance = 7
#max_block_generate_distance = 5
#time_send_interval = 20
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 7f0d46a10..586eaa282 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -100,7 +100,7 @@ void set_default_settings(Settings *settings)
//settings->setDefault("max_simultaneous_block_sends_per_client", "1");
// This causes frametime jitter on client side, or does it?
settings->setDefault("max_simultaneous_block_sends_per_client", "2");
- settings->setDefault("max_simultaneous_block_sends_server_total", "8");
+ settings->setDefault("max_simultaneous_block_sends_server_total", "2");
settings->setDefault("max_block_send_distance", "7");
settings->setDefault("max_block_generate_distance", "5");
settings->setDefault("time_send_interval", "20");