diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/defaultsettings.cpp | 1 | ||||
| -rw-r--r-- | src/server.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index cda953082..b1001e0ff 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -391,6 +391,7 @@ void set_default_settings() settings->setDefault("sqlite_synchronous", "2"); settings->setDefault("map_compression_level_disk", "3"); settings->setDefault("map_compression_level_net", "-1"); + settings->setDefault("send_all_item_metadata", "false"); settings->setDefault("full_block_send_enable_min_time_from_building", "2.0"); settings->setDefault("dedicated_server_step", "0.09"); settings->setDefault("active_block_mgmt_interval", "2.0"); diff --git a/src/server.cpp b/src/server.cpp index 8f0bfb4e9..13aad1dbf 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1471,7 +1471,7 @@ void Server::SendInventory(PlayerSAO *sao, bool incremental) NetworkPacket pkt(TOCLIENT_INVENTORY, 0, sao->getPeerID()); std::ostringstream os(std::ios::binary); - sao->getInventory()->serialize(os, incremental, false); + sao->getInventory()->serialize(os, incremental, g_settings->getBool("send_all_item_metadata")); sao->getInventory()->setModified(false); player->setModified(true); @@ -2335,7 +2335,7 @@ void Server::SendBlockNoLock(session_t peer_id, MapBlock *block, u8 ver, */ thread_local const int net_compression_level = rangelim(g_settings->getS16("map_compression_level_net"), -1, 9); std::ostringstream os(std::ios_base::binary); - block->serialize(os, ver, false, net_compression_level, false); + block->serialize(os, ver, false, net_compression_level, g_settings->getBool("send_all_item_metadata")); block->serializeNetworkSpecific(os); std::string s = os.str(); @@ -2692,7 +2692,7 @@ void Server::sendDetachedInventory(Inventory *inventory, const std::string &name // Serialization & NetworkPacket isn't a love story std::ostringstream os(std::ios_base::binary); - inventory->serialize(os, false, false); + inventory->serialize(os, false, g_settings->getBool("send_all_item_metadata")); inventory->setModified(false); const std::string &os_str = os.str(); |