Adjust some settings to modern environments and networks. (#7549)

This commit is contained in:
lhofhansl 2018-07-13 22:11:49 +02:00 committed by Loïc Blot
parent 8d629cf65b
commit a95aed8800
2 changed files with 11 additions and 11 deletions

View File

@ -923,7 +923,7 @@ ipv6_server (IPv6 server) bool false
# Maximum number of blocks that are simultaneously sent per client. # Maximum number of blocks that are simultaneously sent per client.
# The maximum total count is calculated dynamically: # The maximum total count is calculated dynamically:
# max_total = ceil((#clients + max_users) * per_client / 4) # max_total = ceil((#clients + max_users) * per_client / 4)
max_simultaneous_block_sends_per_client (Maximum simultaneous block sends per client) int 10 max_simultaneous_block_sends_per_client (Maximum simultaneous block sends per client) int 40
# To reduce lag, block transfers are slowed down when a player is building something. # To reduce lag, block transfers are slowed down when a player is building something.
# This determines how long they are slowed down after placing or removing a node. # This determines how long they are slowed down after placing or removing a node.
@ -1846,17 +1846,17 @@ chunksize (Chunk size) int 5
enable_mapgen_debug_info (Mapgen debug) bool false enable_mapgen_debug_info (Mapgen debug) bool false
# Maximum number of blocks that can be queued for loading. # Maximum number of blocks that can be queued for loading.
emergequeue_limit_total (Absolute limit of emerge queues) int 256 emergequeue_limit_total (Absolute limit of emerge queues) int 512
# Maximum number of blocks to be queued that are to be loaded from file. # Maximum number of blocks to be queued that are to be loaded from file.
# Set to blank for an appropriate amount to be chosen automatically. # Set to blank for an appropriate amount to be chosen automatically.
emergequeue_limit_diskonly (Limit of emerge queues on disk) int 32 emergequeue_limit_diskonly (Limit of emerge queues on disk) int 64
# Maximum number of blocks to be queued that are to be generated. # Maximum number of blocks to be queued that are to be generated.
# Set to blank for an appropriate amount to be chosen automatically. # Set to blank for an appropriate amount to be chosen automatically.
emergequeue_limit_generate (Limit of emerge queues to generate) int 32 emergequeue_limit_generate (Limit of emerge queues to generate) int 64
# Number of emerge threads to use. Make this field blank, or increase this number # Number of emerge threads to use. Make this field blank or 0, or increase this number
# to use multiple threads. On multiprocessor systems, this will improve mapgen speed greatly # to use multiple threads. On multiprocessor systems, this will improve mapgen speed greatly
# at the cost of slightly buggy caves. # at the cost of slightly buggy caves.
num_emerge_threads (Number of emerge threads) int 1 num_emerge_threads (Number of emerge threads) int 0

View File

@ -298,7 +298,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("port", "30000"); settings->setDefault("port", "30000");
settings->setDefault("strict_protocol_version_checking", "false"); settings->setDefault("strict_protocol_version_checking", "false");
settings->setDefault("player_transfer_distance", "0"); settings->setDefault("player_transfer_distance", "0");
settings->setDefault("max_simultaneous_block_sends_per_client", "10"); settings->setDefault("max_simultaneous_block_sends_per_client", "40");
settings->setDefault("time_send_interval", "5"); settings->setDefault("time_send_interval", "5");
settings->setDefault("default_game", "minetest"); settings->setDefault("default_game", "minetest");
@ -351,10 +351,10 @@ void set_default_settings(Settings *settings)
settings->setDefault("ignore_world_load_errors", "false"); settings->setDefault("ignore_world_load_errors", "false");
settings->setDefault("remote_media", ""); settings->setDefault("remote_media", "");
settings->setDefault("debug_log_level", "action"); settings->setDefault("debug_log_level", "action");
settings->setDefault("emergequeue_limit_total", "256"); settings->setDefault("emergequeue_limit_total", "512");
settings->setDefault("emergequeue_limit_diskonly", "32"); settings->setDefault("emergequeue_limit_diskonly", "64");
settings->setDefault("emergequeue_limit_generate", "32"); settings->setDefault("emergequeue_limit_generate", "64");
settings->setDefault("num_emerge_threads", "1"); settings->setDefault("num_emerge_threads", "0");
settings->setDefault("secure.enable_security", "true"); settings->setDefault("secure.enable_security", "true");
settings->setDefault("secure.trusted_mods", ""); settings->setDefault("secure.trusted_mods", "");
settings->setDefault("secure.http_mods", ""); settings->setDefault("secure.http_mods", "");