diff options
| author | Lars Müller <34514239+appgurueu@users.noreply.github.com> | 2022-02-08 19:33:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-08 19:33:10 +0100 |
| commit | ad1da994b2b9d660c41f8ba784ff830aa2693d3b (patch) | |
| tree | 27ab2ea3f4d67bb17931cd03cecf1ef9db9873fc | |
| parent | ba6fbc417ecb812345c1747f42b6606dfc8e1d5b (diff) | |
| download | hax-minetest-server-ad1da994b2b9d660c41f8ba784ff830aa2693d3b.tar.gz hax-minetest-server-ad1da994b2b9d660c41f8ba784ff830aa2693d3b.zip | |
Increase max objects per block defaults (#12055)
| -rw-r--r-- | builtin/settingtypes.txt | 2 | ||||
| -rw-r--r-- | minetest.conf.example | 2 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index ef8b84cff..ff2d72927 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -1306,7 +1306,7 @@ max_clearobjects_extra_loaded_blocks (Max. clearobjects extra blocks) int 4096 server_unload_unused_data_timeout (Unload unused server data) int 29 # Maximum number of statically stored objects in a block. -max_objects_per_block (Maximum objects per block) int 64 +max_objects_per_block (Maximum objects per block) int 256 # See https://www.sqlite.org/pragma.html#pragma_synchronous sqlite_synchronous (Synchronous SQLite) enum 2 0,1,2 diff --git a/minetest.conf.example b/minetest.conf.example index 7f4b5d946..ed2ebc969 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1514,7 +1514,7 @@ # Maximum number of statically stored objects in a block. # type: int -# max_objects_per_block = 64 +# max_objects_per_block = 256 # See https://www.sqlite.org/pragma.html#pragma_synchronous # type: enum values: 0, 1, 2 diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 600fc65f3..b935c0e21 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -386,7 +386,7 @@ void set_default_settings() settings->setDefault("time_speed", "72"); settings->setDefault("world_start_time", "6125"); settings->setDefault("server_unload_unused_data_timeout", "29"); - settings->setDefault("max_objects_per_block", "64"); + settings->setDefault("max_objects_per_block", "256"); settings->setDefault("server_map_save_interval", "5.3"); settings->setDefault("chat_message_max_size", "500"); settings->setDefault("chat_message_limit_per_10sec", "8.0"); @@ -479,7 +479,6 @@ void set_default_settings() settings->setDefault("enable_3d_clouds", "false"); settings->setDefault("fps_max", "30"); settings->setDefault("fps_max_unfocused", "10"); - settings->setDefault("max_objects_per_block", "20"); settings->setDefault("sqlite_synchronous", "1"); settings->setDefault("map_compression_level_disk", "-1"); settings->setDefault("map_compression_level_net", "-1"); |