Increase max objects per block defaults (#12055)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index ef8b84cff803536ca5d842153560023d3baad331..ff2d72927c63e326341796b75c1765baa94fce3d 100644 (file)
--- 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 7f4b5d9466d0ab64c510a94d319eb9992833cb74..ed2ebc969fd1979f35c5f10065b23531c94d4abe 100644 (file)
--- 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 600fc65f359b298164141a48e87f66e710957824..b935c0e219e0c3ed5f2a1891f173aa883ba467eb 100644 (file)
--- 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");