]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/server.cpp
Cpp11 patchset 11: continue working on constructor style migration (#6004)
[dragonfireclient.git] / src / server.cpp
index 09675dae3afa4807d5ef2027f5cd920fd02aea25..95d2371ff1153591957ab906f54f3edfa4e441ff 100644 (file)
@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "profiler.h"
 #include "log.h"
-#include "scripting_game.h"
+#include "scripting_server.h"
 #include "nodedef.h"
 #include "itemdef.h"
 #include "craftdef.h"
@@ -47,14 +47,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mg_biome.h"
 #include "content_mapnode.h"
 #include "content_nodemeta.h"
-#include "content_abm.h"
 #include "content_sao.h"
 #include "mods.h"
-#include "sound.h" // dummySoundManager
 #include "event_manager.h"
 #include "serverlist.h"
 #include "util/string.h"
-#include "util/mathconstants.h"
 #include "rollback.h"
 #include "util/serialize.h"
 #include "util/thread.h"
@@ -62,6 +59,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/base64.h"
 #include "util/sha1.h"
 #include "util/hex.h"
+#include "database.h"
 
 class ClientNotFoundException : public BaseException
 {
@@ -108,7 +106,8 @@ void *ServerThread::run()
                } catch (con::ConnectionBindFailed &e) {
                        m_server->setAsyncFatalError(e.what());
                } catch (LuaError &e) {
-                       m_server->setAsyncFatalError("Lua: " + std::string(e.what()));
+                       m_server->setAsyncFatalError(
+                                       "ServerThread::run Lua: " + std::string(e.what()));
                }
        }
 
@@ -148,47 +147,28 @@ Server::Server(
                const std::string &path_world,
                const SubgameSpec &gamespec,
                bool simple_singleplayer_mode,
-               bool ipv6
+               bool ipv6,
+               bool dedicated,
+               ChatInterface *iface
        ):
        m_path_world(path_world),
        m_gamespec(gamespec),
        m_simple_singleplayer_mode(simple_singleplayer_mode),
+       m_dedicated(dedicated),
        m_async_fatal_error(""),
-       m_env(NULL),
        m_con(PROTOCOL_ID,
                        512,
                        CONNECTION_TIMEOUT,
                        ipv6,
                        this),
-       m_banmanager(NULL),
-       m_rollback(NULL),
-       m_enable_rollback_recording(false),
-       m_emerge(NULL),
-       m_script(NULL),
        m_itemdef(createItemDefManager()),
        m_nodedef(createNodeDefManager()),
        m_craftdef(createCraftDefManager()),
        m_event(new EventManager()),
-       m_thread(NULL),
-       m_time_of_day_send_timer(0),
        m_uptime(0),
        m_clients(&m_con),
-       m_shutdown_requested(false),
-       m_shutdown_ask_reconnect(false),
-       m_ignore_map_edit_events(false),
-       m_ignore_map_edit_events_peer_id(0),
-       m_next_sound_id(0)
-
-{
-       m_liquid_transform_timer = 0.0;
-       m_liquid_transform_every = 1.0;
-       m_print_info_timer = 0.0;
-       m_masterserver_timer = 0.0;
-       m_objectdata_timer = 0.0;
-       m_emergethread_trigger_timer = 0.0;
-       m_savemap_timer = 0.0;
-
-       m_step_dtime = 0.0;
+       m_admin_chat(iface)
+{
        m_lag = g_settings->getFloat("dedicated_server_step");
 
        if(path_world == "")
@@ -219,98 +199,47 @@ Server::Server(
        std::string ban_path = m_path_world + DIR_DELIM "ipban.txt";
        m_banmanager = new BanManager(ban_path);
 
-       ModConfiguration modconf(m_path_world);
+       ServerModConfiguration modconf(m_path_world);
        m_mods = modconf.getMods();
        std::vector<ModSpec> unsatisfied_mods = modconf.getUnsatisfiedMods();
        // complain about mods with unsatisfied dependencies
-       if(!modconf.isConsistent()) {
-               for(std::vector<ModSpec>::iterator it = unsatisfied_mods.begin();
-                       it != unsatisfied_mods.end(); ++it) {
-                       ModSpec mod = *it;
-                       errorstream << "mod \"" << mod.name << "\" has unsatisfied dependencies: ";
-                       for(std::set<std::string>::iterator dep_it = mod.unsatisfied_depends.begin();
-                               dep_it != mod.unsatisfied_depends.end(); ++dep_it)
-                               errorstream << " \"" << *dep_it << "\"";
-                       errorstream << std::endl;
-               }
-       }
-
-       Settings worldmt_settings;
-       std::string worldmt = m_path_world + DIR_DELIM + "world.mt";
-       worldmt_settings.readConfigFile(worldmt.c_str());
-       std::vector<std::string> names = worldmt_settings.getNames();
-       std::set<std::string> load_mod_names;
-       for(std::vector<std::string>::iterator it = names.begin();
-               it != names.end(); ++it) {
-               std::string name = *it;
-               if(name.compare(0,9,"load_mod_")==0 && worldmt_settings.getBool(name))
-                       load_mod_names.insert(name.substr(9));
-       }
-       // complain about mods declared to be loaded, but not found
-       for(std::vector<ModSpec>::iterator it = m_mods.begin();
-                       it != m_mods.end(); ++it)
-               load_mod_names.erase((*it).name);
-       for(std::vector<ModSpec>::iterator it = unsatisfied_mods.begin();
-                       it != unsatisfied_mods.end(); ++it)
-               load_mod_names.erase((*it).name);
-       if(!load_mod_names.empty()) {
-               errorstream << "The following mods could not be found:";
-               for(std::set<std::string>::iterator it = load_mod_names.begin();
-                       it != load_mod_names.end(); ++it)
-                       errorstream << " \"" << (*it) << "\"";
-               errorstream << std::endl;
+       if (!modconf.isConsistent()) {
+               modconf.printUnsatisfiedModsError();
        }
 
        //lock environment
        MutexAutoLock envlock(m_env_mutex);
 
-       // Load mapgen params from Settings
-       m_emerge->loadMapgenParams();
-
        // Create the Map (loads map_meta.txt, overriding configured mapgen params)
        ServerMap *servermap = new ServerMap(path_world, this, m_emerge);
 
        // Initialize scripting
        infostream<<"Server: Initializing Lua"<<std::endl;
 
-       m_script = new GameScripting(this);
-
-       std::string script_path = getBuiltinLuaPath() + DIR_DELIM "init.lua";
-       std::string error_msg;
+       m_script = new ServerScripting(this);
 
-       if (!m_script->loadMod(script_path, BUILTIN_MOD_NAME, &error_msg))
-               throw ModError("Failed to load and run " + script_path
-                               + "\nError from Lua:\n" + error_msg);
+       m_script->loadMod(getBuiltinLuaPath() + DIR_DELIM "init.lua", BUILTIN_MOD_NAME);
 
        // Print mods
        infostream << "Server: Loading mods: ";
-       for(std::vector<ModSpec>::iterator i = m_mods.begin();
+       for (std::vector<ModSpec>::const_iterator i = m_mods.begin();
                        i != m_mods.end(); ++i) {
-               const ModSpec &mod = *i;
-               infostream << mod.name << " ";
+               infostream << (*i).name << " ";
        }
        infostream << std::endl;
        // Load and run "mod" scripts
-       for (std::vector<ModSpec>::iterator i = m_mods.begin();
-                       i != m_mods.end(); ++i) {
-               const ModSpec &mod = *i;
+       for (std::vector<ModSpec>::const_iterator it = m_mods.begin();
+                       it != m_mods.end(); ++it) {
+               const ModSpec &mod = *it;
                if (!string_allowed(mod.name, MODNAME_ALLOWED_CHARS)) {
-                       std::ostringstream err;
-                       err << "Error loading mod \"" << mod.name
-                                       << "\": mod_name does not follow naming conventions: "
-                                       << "Only chararacters [a-z0-9_] are allowed." << std::endl;
-                       errorstream << err.str().c_str();
-                       throw ModError(err.str());
+                       throw ModError("Error loading mod \"" + mod.name +
+                               "\": Mod name does not follow naming conventions: "
+                               "Only characters [a-z0-9_] are allowed.");
                }
-               std::string script_path = mod.path + DIR_DELIM "init.lua";
+               std::string script_path = mod.path + DIR_DELIM "init.lua";
                infostream << "  [" << padStringRight(mod.name, 12) << "] [\""
                                << script_path << "\"]" << std::endl;
-               if (!m_script->loadMod(script_path, mod.name, &error_msg)) {
-                       errorstream << "Server: Failed to load and run "
-                                       << script_path << std::endl;
-                       throw ModError("Failed to load and run " + script_path
-                                       + "\nError from Lua:\n" + error_msg);
-               }
+               m_script->loadMod(script_path, mod.name);
        }
 
        // Read Textures and calculate sha1 sums
@@ -329,6 +258,9 @@ Server::Server(
        // Perform pending node name resolutions
        m_nodedef->runNodeResolveCallbacks();
 
+       // unmap node names for connected nodeboxes
+       m_nodedef->mapNodeboxConnections();
+
        // init the recipe hashes to speed up crafting
        m_craftdef->initHashes(this);
 
@@ -337,8 +269,11 @@ Server::Server(
 
        m_clients.setEnv(m_env);
 
+       if (!servermap->settings_mgr.makeMapgenParams())
+               FATAL_ERROR("Couldn't create any mapgen type");
+
        // Initialize mapgens
-       m_emerge->initMapgens();
+       m_emerge->initMapgens(servermap->getMapgenParams());
 
        m_enable_rollback_recording = g_settings->getBool("enable_rollback_recording");
        if (m_enable_rollback_recording) {
@@ -353,16 +288,15 @@ Server::Server(
        servermap->addEventReceiver(this);
 
        // If file exists, load environment metadata
-       if(fs::PathExists(m_path_world + DIR_DELIM "env_meta.txt"))
-       {
-               infostream<<"Server: Loading environment metadata"<<std::endl;
+       if (fs::PathExists(m_path_world + DIR_DELIM "env_meta.txt")) {
+               infostream << "Server: Loading environment metadata" << std::endl;
                m_env->loadMeta();
+       } else {
+               m_env->loadDefaultMeta();
        }
 
-       // Add some test ActiveBlockModifiers to environment
-       add_legacy_abms(m_env, m_nodedef);
-
        m_liquid_transform_every = g_settings->getFloat("liquid_update");
+       m_max_chatmessage_length = g_settings->getU16("chat_message_max_size");
 }
 
 Server::~Server()
@@ -407,11 +341,8 @@ Server::~Server()
        m_emerge->stopThreads();
 
        // Delete things in the reverse order of creation
-       delete m_env;
-
-       // N.B. the EmergeManager should be deleted after the Environment since Map
-       // depends on EmergeManager to write its current params to the map meta
        delete m_emerge;
+       delete m_env;
        delete m_rollback;
        delete m_banmanager;
        delete m_event;
@@ -483,7 +414,7 @@ void Server::step(float dtime)
 {
        DSTACK(FUNCTION_NAME);
        // Limit a bit
-       if(dtime > 2.0)
+       if (dtime > 2.0)
                dtime = 2.0;
        {
                MutexAutoLock lock(m_step_dtime_mutex);
@@ -491,19 +422,13 @@ void Server::step(float dtime)
        }
        // Throw if fatal error occurred in thread
        std::string async_err = m_async_fatal_error.get();
-       if(async_err != "") {
-               if (m_simple_singleplayer_mode) {
-                       throw ServerError(async_err);
-               }
-               else {
+       if (!async_err.empty()) {
+               if (!m_simple_singleplayer_mode) {
                        m_env->kickAllPlayers(SERVER_ACCESSDENIED_CRASH,
                                g_settings->get("kick_msg_crash"),
                                g_settings->getBool("ask_reconnect_on_crash"));
-                       errorstream << "UNRECOVERABLE error occurred. Stopping server. "
-                                       << "Please fix the following error:" << std::endl
-                                       << async_err << std::endl;
-                       FATAL_ERROR(async_err.c_str());
                }
+               throw ServerError("AsyncErr: " + async_err);
        }
 }
 
@@ -592,6 +517,22 @@ void Server::AsyncRunStep(bool initial_step)
                        U32_MAX);
        }
 
+       /*
+               Listen to the admin chat, if available
+       */
+       if (m_admin_chat) {
+               if (!m_admin_chat->command_queue.empty()) {
+                       MutexAutoLock lock(m_env_mutex);
+                       while (!m_admin_chat->command_queue.empty()) {
+                               ChatEvent *evt = m_admin_chat->command_queue.pop_frontNoEx();
+                               handleChatInterfaceEvent(evt);
+                               delete evt;
+                       }
+               }
+               m_admin_chat->outgoing_queue.push_back(
+                       new ChatEventTimeInfo(m_env->getGameTime(), m_env->getTimeOfDay()));
+       }
+
        /*
                Do background stuff
        */
@@ -607,7 +548,7 @@ void Server::AsyncRunStep(bool initial_step)
                ScopeProfiler sp(g_profiler, "Server: liquid transform");
 
                std::map<v3s16, MapBlock*> modified_blocks;
-               m_env->getMap().transformLiquids(modified_blocks);
+               m_env->getMap().transformLiquids(modified_blocks, m_env);
 #if 0
                /*
                        Update lighting
@@ -640,18 +581,19 @@ void Server::AsyncRunStep(bool initial_step)
        // send masterserver announce
        {
                float &counter = m_masterserver_timer;
-               if(!isSingleplayer() && (!counter || counter >= 300.0) &&
-                               g_settings->getBool("server_announce"))
-               {
-                       ServerList::sendAnnounce(counter ? "update" : "start",
+               if (!isSingleplayer() && (!counter || counter >= 300.0) &&
+                               g_settings->getBool("server_announce")) {
+                       ServerList::sendAnnounce(counter ? ServerList::AA_UPDATE :
+                                               ServerList::AA_START,
                                        m_bind_addr.getPort(),
                                        m_clients.getPlayerNames(),
                                        m_uptime.get(),
                                        m_env->getGameTime(),
                                        m_lag,
                                        m_gamespec.id,
-                                       m_emerge->params.mg_name,
-                                       m_mods);
+                                       Mapgen::getMapgenName(m_emerge->mgparams->mgtype),
+                                       m_mods,
+                                       m_dedicated);
                        counter = 0.01;
                }
                counter += dtime;
@@ -666,22 +608,24 @@ void Server::AsyncRunStep(bool initial_step)
                MutexAutoLock envlock(m_env_mutex);
 
                m_clients.lock();
-               std::map<u16, RemoteClient*> clients = m_clients.getClientList();
+               RemoteClientMap clients = m_clients.getClientList();
                ScopeProfiler sp(g_profiler, "Server: checking added and deleted objs");
 
                // Radius inside which objects are active
-               s16 radius = g_settings->getS16("active_object_send_range_blocks");
-               s16 player_radius = g_settings->getS16("player_transfer_distance");
-
-               if (player_radius == 0 && g_settings->exists("unlimited_player_transfer_distance") &&
-                               !g_settings->getBool("unlimited_player_transfer_distance"))
+               static thread_local const s16 radius =
+                       g_settings->getS16("active_object_send_range_blocks") * MAP_BLOCKSIZE;
+
+               // Radius inside which players are active
+               static thread_local const bool is_transfer_limited =
+                       g_settings->exists("unlimited_player_transfer_distance") &&
+                       !g_settings->getBool("unlimited_player_transfer_distance");
+               static thread_local const s16 player_transfer_dist =
+                       g_settings->getS16("player_transfer_distance") * MAP_BLOCKSIZE;
+               s16 player_radius = player_transfer_dist;
+               if (player_radius == 0 && is_transfer_limited)
                        player_radius = radius;
 
-               radius *= MAP_BLOCKSIZE;
-               player_radius *= MAP_BLOCKSIZE;
-
-               for (std::map<u16, RemoteClient*>::iterator
-                       i = clients.begin();
+               for (RemoteClientMap::iterator i = clients.begin();
                        i != clients.end(); ++i) {
                        RemoteClient *client = i->second;
 
@@ -690,8 +634,8 @@ void Server::AsyncRunStep(bool initial_step)
                        if (client->getState() < CS_DefinitionsSent)
                                continue;
 
-                       Player *player = m_env->getPlayer(client->peer_id);
-                       if(player == NULL) {
+                       RemotePlayer *player = m_env->getPlayer(client->peer_id);
+                       if (player == NULL) {
                                // This can happen if the client timeouts somehow
                                /*warningstream<<FUNCTION_NAME<<": Client "
                                                <<client->peer_id
@@ -699,11 +643,19 @@ void Server::AsyncRunStep(bool initial_step)
                                continue;
                        }
 
+                       PlayerSAO *playersao = player->getPlayerSAO();
+                       if (playersao == NULL)
+                               continue;
+
+                       s16 my_radius = MYMIN(radius, playersao->getWantedRange() * MAP_BLOCKSIZE);
+                       if (my_radius <= 0) my_radius = radius;
+                       //infostream << "Server: Active Radius " << my_radius << std::endl;
+
                        std::queue<u16> removed_objects;
                        std::queue<u16> added_objects;
-                       m_env->getRemovedActiveObjects(playerradius, player_radius,
+                       m_env->getRemovedActiveObjects(playersao, my_radius, player_radius,
                                        client->m_known_objects, removed_objects);
-                       m_env->getAddedActiveObjects(playerradius, player_radius,
+                       m_env->getAddedActiveObjects(playersao, my_radius, player_radius,
                                        client->m_known_objects, added_objects);
 
                        // Ignore if nothing happened
@@ -779,6 +731,18 @@ void Server::AsyncRunStep(bool initial_step)
                                        << "packet size is " << pktSize << std::endl;
                }
                m_clients.unlock();
+
+               m_mod_storage_save_timer -= dtime;
+               if (m_mod_storage_save_timer <= 0.0f) {
+                       infostream << "Saving registered mod storages." << std::endl;
+                       m_mod_storage_save_timer = g_settings->getFloat("server_map_save_interval");
+                       for (std::unordered_map<std::string, ModMetadata *>::const_iterator
+                               it = m_mod_storages.begin(); it != m_mod_storages.end(); ++it) {
+                               if (it->second->isModified()) {
+                                       it->second->save(getModStoragePath());
+                               }
+                       }
+               }
        }
 
        /*
@@ -790,7 +754,7 @@ void Server::AsyncRunStep(bool initial_step)
 
                // Key = object id
                // Value = data sent by object
-               std::map<u16, std::vector<ActiveObjectMessage>* > buffered_messages;
+               std::unordered_map<u16, std::vector<ActiveObjectMessage>*> buffered_messages;
 
                // Get active object messages from environment
                for(;;) {
@@ -799,7 +763,7 @@ void Server::AsyncRunStep(bool initial_step)
                                break;
 
                        std::vector<ActiveObjectMessage>* message_list = NULL;
-                       std::map<u16, std::vector<ActiveObjectMessage>* >::iterator n;
+                       std::unordered_map<u16, std::vector<ActiveObjectMessage>* >::iterator n;
                        n = buffered_messages.find(aom.id);
                        if (n == buffered_messages.end()) {
                                message_list = new std::vector<ActiveObjectMessage>;
@@ -812,16 +776,15 @@ void Server::AsyncRunStep(bool initial_step)
                }
 
                m_clients.lock();
-               std::map<u16, RemoteClient*> clients = m_clients.getClientList();
+               RemoteClientMap clients = m_clients.getClientList();
                // Route data to every client
-               for (std::map<u16, RemoteClient*>::iterator
-                       i = clients.begin();
-                       i != clients.end(); ++i) {
+               for (std::unordered_map<u16, RemoteClient*>::iterator i = clients.begin();
+                               i != clients.end(); ++i) {
                        RemoteClient *client = i->second;
                        std::string reliable_data;
                        std::string unreliable_data;
                        // Go through all objects in message buffer
-                       for (std::map<u16, std::vector<ActiveObjectMessage>* >::iterator
+                       for (std::unordered_map<u16, std::vector<ActiveObjectMessage>* >::iterator
                                        j = buffered_messages.begin();
                                        j != buffered_messages.end(); ++j) {
                                // If object is not known by client, skip it
@@ -865,7 +828,7 @@ void Server::AsyncRunStep(bool initial_step)
                m_clients.unlock();
 
                // Clear buffered_messages
-               for(std::map<u16, std::vector<ActiveObjectMessage>* >::iterator
+               for (std::unordered_map<u16, std::vector<ActiveObjectMessage>* >::iterator
                                i = buffered_messages.begin();
                                i != buffered_messages.end(); ++i) {
                        delete i->second;
@@ -983,8 +946,7 @@ void Server::AsyncRunStep(bool initial_step)
        {
                float &counter = m_emergethread_trigger_timer;
                counter += dtime;
-               if(counter >= 2.0)
-               {
+               if (counter >= 2.0) {
                        counter = 0.0;
 
                        m_emerge->startThreads();
@@ -995,8 +957,9 @@ void Server::AsyncRunStep(bool initial_step)
        {
                float &counter = m_savemap_timer;
                counter += dtime;
-               if(counter >= g_settings->getFloat("server_map_save_interval"))
-               {
+               static thread_local const float save_interval =
+                       g_settings->getFloat("server_map_save_interval");
+               if (counter >= save_interval) {
                        counter = 0.0;
                        MutexAutoLock lock(m_env_mutex);
 
@@ -1017,6 +980,39 @@ void Server::AsyncRunStep(bool initial_step)
                        m_env->saveMeta();
                }
        }
+
+       // Timed shutdown
+       static const float shutdown_msg_times[] =
+       {
+               1, 2, 3, 4, 5, 10, 15, 20, 25, 30, 45, 60, 120, 180, 300, 600, 1200, 1800, 3600
+       };
+
+       if (m_shutdown_timer > 0.0f) {
+               // Automated messages
+               if (m_shutdown_timer < shutdown_msg_times[ARRLEN(shutdown_msg_times) - 1]) {
+                       for (u16 i = 0; i < ARRLEN(shutdown_msg_times) - 1; i++) {
+                               // If shutdown timer matches an automessage, shot it
+                               if (m_shutdown_timer > shutdown_msg_times[i] &&
+                                       m_shutdown_timer - dtime < shutdown_msg_times[i]) {
+                                       std::wstringstream ws;
+
+                                       ws << L"*** Server shutting down in "
+                                               << duration_to_string(myround(m_shutdown_timer - dtime)).c_str()
+                                               << ".";
+
+                                       infostream << wide_to_utf8(ws.str()).c_str() << std::endl;
+                                       SendChatMessage(PEER_ID_INEXISTENT, ws.str());
+                                       break;
+                               }
+                       }
+               }
+
+               m_shutdown_timer -= dtime;
+               if (m_shutdown_timer < 0.0f) {
+                       m_shutdown_timer = 0.0f;
+                       m_shutdown_requested = true;
+               }
+       }
 }
 
 void Server::Receive()
@@ -1067,8 +1063,7 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
        }
        m_clients.unlock();
 
-       RemotePlayer *player =
-               static_cast<RemotePlayer*>(m_env->getPlayer(playername.c_str()));
+       RemotePlayer *player = m_env->getPlayer(playername.c_str());
 
        // If failed, cancel
        if ((playersao == NULL) || (player == NULL)) {
@@ -1100,34 +1095,19 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
        // Send inventory
        SendInventory(playersao);
 
-       // Send HP
-       SendPlayerHPOrDie(playersao);
+       // Send HP or death screen
+       if (playersao->isDead())
+               SendDeathscreen(peer_id, false, v3f(0,0,0));
+       else
+               SendPlayerHPOrDie(playersao);
 
        // Send Breath
-       SendPlayerBreath(peer_id);
-
-       // Show death screen if necessary
-       if(player->isDead())
-               SendDeathscreen(peer_id, false, v3f(0,0,0));
+       SendPlayerBreath(playersao);
 
        // Note things in chat if not in simple singleplayer mode
-       if(!m_simple_singleplayer_mode) {
+       if (!m_simple_singleplayer_mode && g_settings->getBool("show_statusline_on_connect")) {
                // Send information about server to player in chat
                SendChatMessage(peer_id, getStatusString());
-
-               // Send information about joining in chat
-               {
-                       std::wstring name = L"unknown";
-                       Player *player = m_env->getPlayer(peer_id);
-                       if(player != NULL)
-                               name = narrow_to_wide(player->getName());
-
-                       std::wstring message;
-                       message += L"*** ";
-                       message += name;
-                       message += L" joined the game.";
-                       SendChatMessage(PEER_ID_INEXISTENT,message);
-               }
        }
        Address addr = getPeerAddress(player->peer_id);
        std::string ip_str = addr.serializeString();
@@ -1136,11 +1116,11 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
                Print out action
        */
        {
-               std::vector<std::string> names = m_clients.getPlayerNames();
+               const std::vector<std::string> &names = m_clients.getPlayerNames();
 
-               actionstream<<player->getName() <<" joins game. List of players: ";
+               actionstream << player->getName() << " joins game. List of players: ";
 
-               for (std::vector<std::string>::iterator i = names.begin();
+               for (std::vector<std::string>::const_iterator i = names.begin();
                                i != names.end(); ++i) {
                        actionstream << *i << " ";
                }
@@ -1249,11 +1229,6 @@ void Server::setTimeOfDay(u32 time)
        m_time_of_day_send_timer = 0;
 }
 
-u32 Server::getTimeOfDay()
-{
-       return m_env->getTimeOfDay();
-}
-
 void Server::onMapEditEvent(MapEditEvent *event)
 {
        if(m_ignore_map_edit_events)
@@ -1272,7 +1247,7 @@ Inventory* Server::getInventory(const InventoryLocation &loc)
                break;
        case InventoryLocation::PLAYER:
        {
-               Player *player = m_env->getPlayer(loc.name.c_str());
+               RemotePlayer *player = dynamic_cast<RemotePlayer *>(m_env->getPlayer(loc.name.c_str()));
                if(!player)
                        return NULL;
                PlayerSAO *playersao = player->getPlayerSAO();
@@ -1312,9 +1287,12 @@ void Server::setInventoryModified(const InventoryLocation &loc, bool playerSend)
                if (!playerSend)
                        return;
 
-               Player *player = m_env->getPlayer(loc.name.c_str());
-               if(!player)
+               RemotePlayer *player =
+                       dynamic_cast<RemotePlayer *>(m_env->getPlayer(loc.name.c_str()));
+
+               if (!player)
                        return;
+
                PlayerSAO *playersao = player->getPlayerSAO();
                if(!playersao)
                        return;
@@ -1454,6 +1432,16 @@ void Server::handlePeerChanges()
        }
 }
 
+void Server::printToConsoleOnly(const std::string &text)
+{
+       if (m_admin_chat) {
+               m_admin_chat->outgoing_queue.push_back(
+                       new ChatEventChat("", utf8_to_wide(text)));
+       } else {
+               std::cout << text << std::endl;
+       }
+}
+
 void Server::Send(NetworkPacket* pkt)
 {
        m_clients.send(pkt->getPeerId(),
@@ -1630,15 +1618,18 @@ void Server::SendInventory(PlayerSAO* playerSAO)
 void Server::SendChatMessage(u16 peer_id, const std::wstring &message)
 {
        DSTACK(FUNCTION_NAME);
+       if (peer_id != PEER_ID_INEXISTENT) {
+               NetworkPacket pkt(TOCLIENT_CHAT_MESSAGE, 0, peer_id);
 
-       NetworkPacket pkt(TOCLIENT_CHAT_MESSAGE, 0, peer_id);
-       pkt << message;
+               if (m_clients.getProtocolVersion(peer_id) < 27)
+                       pkt << unescape_enriched(message);
+               else
+                       pkt << message;
 
-       if (peer_id != PEER_ID_INEXISTENT) {
                Send(&pkt);
-       }
-       else {
-               m_clients.sendToAll(0, &pkt, true);
+       } else {
+               for (u16 id : m_clients.getClientIDs())
+                       SendChatMessage(id, message);
        }
 }
 
@@ -1648,19 +1639,52 @@ void Server::SendShowFormspecMessage(u16 peer_id, const std::string &formspec,
        DSTACK(FUNCTION_NAME);
 
        NetworkPacket pkt(TOCLIENT_SHOW_FORMSPEC, 0 , peer_id);
-
-       pkt.putLongString(FORMSPEC_VERSION_STRING + formspec);
+       if (formspec == "" ){
+               //the client should close the formspec
+               pkt.putLongString("");
+       } else {
+               pkt.putLongString(FORMSPEC_VERSION_STRING + formspec);
+       }
        pkt << formname;
 
        Send(&pkt);
 }
 
 // Spawns a particle on peer with peer_id
-void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f acceleration,
+void Server::SendSpawnParticle(u16 peer_id, u16 protocol_version,
+                               v3f pos, v3f velocity, v3f acceleration,
                                float expirationtime, float size, bool collisiondetection,
-                               bool vertical, std::string texture)
+                               bool collision_removal,
+                               bool vertical, const std::string &texture,
+                               const struct TileAnimationParams &animation, u8 glow)
 {
        DSTACK(FUNCTION_NAME);
+       static thread_local const float radius =
+                       g_settings->getS16("max_block_send_distance") * MAP_BLOCKSIZE * BS;
+
+       if (peer_id == PEER_ID_INEXISTENT) {
+               std::vector<u16> clients = m_clients.getClientIDs();
+
+               for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) {
+                       RemotePlayer *player = m_env->getPlayer(*i);
+                       if (!player)
+                               continue;
+
+                       PlayerSAO *sao = player->getPlayerSAO();
+                       if (!sao)
+                               continue;
+
+                       // Do not send to distant clients
+                       if (sao->getBasePosition().getDistanceFrom(pos * BS) > radius)
+                               continue;
+
+                       SendSpawnParticle(*i, player->protocol_version,
+                                       pos, velocity, acceleration,
+                                       expirationtime, size, collisiondetection,
+                                       collision_removal, vertical, texture, animation, glow);
+               }
+               return;
+       }
 
        NetworkPacket pkt(TOCLIENT_SPAWN_PARTICLE, 0, peer_id);
 
@@ -1668,21 +1692,40 @@ void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f accelerat
                        << size << collisiondetection;
        pkt.putLongString(texture);
        pkt << vertical;
+       pkt << collision_removal;
+       // This is horrible but required (why are there two ways to serialize pkts?)
+       std::ostringstream os(std::ios_base::binary);
+       animation.serialize(os, protocol_version);
+       pkt.putRawString(os.str());
+       pkt << glow;
 
-       if (peer_id != PEER_ID_INEXISTENT) {
-               Send(&pkt);
-       }
-       else {
-               m_clients.sendToAll(0, &pkt, true);
-       }
+       Send(&pkt);
 }
 
 // Adds a ParticleSpawner on peer with peer_id
-void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3f minpos, v3f maxpos,
+void Server::SendAddParticleSpawner(u16 peer_id, u16 protocol_version,
+       u16 amount, float spawntime, v3f minpos, v3f maxpos,
        v3f minvel, v3f maxvel, v3f minacc, v3f maxacc, float minexptime, float maxexptime,
-       float minsize, float maxsize, bool collisiondetection, bool vertical, std::string texture, u32 id)
+       float minsize, float maxsize, bool collisiondetection, bool collision_removal,
+       u16 attached_id, bool vertical, const std::string &texture, u32 id,
+       const struct TileAnimationParams &animation, u8 glow)
 {
        DSTACK(FUNCTION_NAME);
+       if (peer_id == PEER_ID_INEXISTENT) {
+               // This sucks and should be replaced:
+               std::vector<u16> clients = m_clients.getClientIDs();
+               for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) {
+                       RemotePlayer *player = m_env->getPlayer(*i);
+                       if (!player)
+                               continue;
+                       SendAddParticleSpawner(*i, player->protocol_version,
+                                       amount, spawntime, minpos, maxpos,
+                                       minvel, maxvel, minacc, maxacc, minexptime, maxexptime,
+                                       minsize, maxsize, collisiondetection, collision_removal,
+                                       attached_id, vertical, texture, id, animation, glow);
+               }
+               return;
+       }
 
        NetworkPacket pkt(TOCLIENT_ADD_PARTICLESPAWNER, 0, peer_id);
 
@@ -1693,13 +1736,15 @@ void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3
        pkt.putLongString(texture);
 
        pkt << id << vertical;
+       pkt << collision_removal;
+       pkt << attached_id;
+       // This is horrible but required
+       std::ostringstream os(std::ios_base::binary);
+       animation.serialize(os, protocol_version);
+       pkt.putRawString(os.str());
+       pkt << glow;
 
-       if (peer_id != PEER_ID_INEXISTENT) {
-               Send(&pkt);
-       }
-       else {
-               m_clients.sendToAll(0, &pkt, true);
-       }
+       Send(&pkt);
 }
 
 void Server::SendDeleteParticleSpawner(u16 peer_id, u32 id)
@@ -1715,7 +1760,7 @@ void Server::SendDeleteParticleSpawner(u16 peer_id, u32 id)
                Send(&pkt);
        }
        else {
-               m_clients.sendToAll(0, &pkt, true);
+               m_clients.sendToAll(&pkt);
        }
 
 }
@@ -1790,7 +1835,8 @@ void Server::SendHUDSetParam(u16 peer_id, u16 param, const std::string &value)
 }
 
 void Server::SendSetSky(u16 peer_id, const video::SColor &bgcolor,
-               const std::string &type, const std::vector<std::string> &params)
+               const std::string &type, const std::vector<std::string> &params,
+               bool &clouds)
 {
        NetworkPacket pkt(TOCLIENT_SET_SKY, 0, peer_id);
        pkt << bgcolor << type << (u16) params.size();
@@ -1798,6 +1844,22 @@ void Server::SendSetSky(u16 peer_id, const video::SColor &bgcolor,
        for(size_t i=0; i<params.size(); i++)
                pkt << params[i];
 
+       pkt << clouds;
+
+       Send(&pkt);
+}
+
+void Server::SendCloudParams(u16 peer_id, float density,
+               const video::SColor &color_bright,
+               const video::SColor &color_ambient,
+               float height,
+               float thickness,
+               const v2f &speed)
+{
+       NetworkPacket pkt(TOCLIENT_CLOUD_PARAMS, 0, peer_id);
+       pkt << density << color_bright << color_ambient
+                       << height << thickness << speed;
+
        Send(&pkt);
 }
 
@@ -1820,7 +1882,7 @@ void Server::SendTimeOfDay(u16 peer_id, u16 time, f32 time_speed)
        pkt << time << time_speed;
 
        if (peer_id == PEER_ID_INEXISTENT) {
-               m_clients.sendToAll(0, &pkt, true);
+               m_clients.sendToAll(&pkt);
        }
        else {
                Send(&pkt);
@@ -1831,7 +1893,7 @@ void Server::SendPlayerHP(u16 peer_id)
 {
        DSTACK(FUNCTION_NAME);
        PlayerSAO *playersao = getPlayerSAO(peer_id);
-       // In some rare case, if the player is disconnected
+       // In some rare case if the player is disconnected
        // while Lua call l_punch, for example, this can be NULL
        if (!playersao)
                return;
@@ -1845,33 +1907,32 @@ void Server::SendPlayerHP(u16 peer_id)
        playersao->m_messages_out.push(aom);
 }
 
-void Server::SendPlayerBreath(u16 peer_id)
+void Server::SendPlayerBreath(PlayerSAO *sao)
 {
        DSTACK(FUNCTION_NAME);
-       PlayerSAO *playersao = getPlayerSAO(peer_id);
-       assert(playersao);
+       assert(sao);
 
-       m_script->player_event(playersao, "breath_changed");
-       SendBreath(peer_id, playersao->getBreath());
+       m_script->player_event(sao, "breath_changed");
+       SendBreath(sao->getPeerID(), sao->getBreath());
 }
 
 void Server::SendMovePlayer(u16 peer_id)
 {
        DSTACK(FUNCTION_NAME);
-       Player *player = m_env->getPlayer(peer_id);
+       RemotePlayer *player = m_env->getPlayer(peer_id);
        assert(player);
+       PlayerSAO *sao = player->getPlayerSAO();
+       assert(sao);
 
        NetworkPacket pkt(TOCLIENT_MOVE_PLAYER, sizeof(v3f) + sizeof(f32) * 2, peer_id);
-       pkt << player->getPosition() << player->getPitch() << player->getYaw();
+       pkt << sao->getBasePosition() << sao->getPitch() << sao->getYaw();
 
        {
-               v3f pos = player->getPosition();
-               f32 pitch = player->getPitch();
-               f32 yaw = player->getYaw();
+               v3f pos = sao->getBasePosition();
                verbosestream << "Server: Sending TOCLIENT_MOVE_PLAYER"
                                << " pos=(" << pos.X << "," << pos.Y << "," << pos.Z << ")"
-                               << " pitch=" << pitch
-                               << " yaw=" << yaw
+                               << " pitch=" << sao->getPitch()
+                               << " yaw=" << sao->getYaw()
                                << std::endl;
        }
 
@@ -1897,7 +1958,7 @@ void Server::SendEyeOffset(u16 peer_id, v3f first, v3f third)
 }
 void Server::SendPlayerPrivileges(u16 peer_id)
 {
-       Player *player = m_env->getPlayer(peer_id);
+       RemotePlayer *player = m_env->getPlayer(peer_id);
        assert(player);
        if(player->peer_id == PEER_ID_INEXISTENT)
                return;
@@ -1918,7 +1979,7 @@ void Server::SendPlayerPrivileges(u16 peer_id)
 
 void Server::SendPlayerInventoryFormspec(u16 peer_id)
 {
-       Player *player = m_env->getPlayer(peer_id);
+       RemotePlayer *player = m_env->getPlayer(peer_id);
        assert(player);
        if(player->peer_id == PEER_ID_INEXISTENT)
                return;
@@ -1963,7 +2024,7 @@ s32 Server::playSound(const SimpleSoundSpec &spec,
        std::vector<u16> dst_clients;
        if(params.to_player != "")
        {
-               Player *player = m_env->getPlayer(params.to_player.c_str());
+               RemotePlayer *player = m_env->getPlayer(params.to_player.c_str());
                if(!player){
                        infostream<<"Server::playSound: Player \""<<params.to_player
                                        <<"\" not found"<<std::endl;
@@ -1979,14 +2040,17 @@ s32 Server::playSound(const SimpleSoundSpec &spec,
        else {
                std::vector<u16> clients = m_clients.getClientIDs();
 
-               for(std::vector<u16>::iterator
-                               i = clients.begin(); i != clients.end(); ++i) {
-                       Player *player = m_env->getPlayer(*i);
-                       if(!player)
+               for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) {
+                       RemotePlayer *player = m_env->getPlayer(*i);
+                       if (!player)
+                               continue;
+
+                       PlayerSAO *sao = player->getPlayerSAO();
+                       if (!sao)
                                continue;
 
-                       if(pos_exists) {
-                               if(player->getPosition().getDistanceFrom(pos) >
+                       if (pos_exists) {
+                               if(sao->getBasePosition().getDistanceFrom(pos) >
                                                params.max_hear_distance)
                                        continue;
                        }
@@ -2003,39 +2067,93 @@ s32 Server::playSound(const SimpleSoundSpec &spec,
        m_playing_sounds[id] = ServerPlayingSound();
        ServerPlayingSound &psound = m_playing_sounds[id];
        psound.params = params;
+       psound.spec = spec;
 
+       float gain = params.gain * spec.gain;
        NetworkPacket pkt(TOCLIENT_PLAY_SOUND, 0);
-       pkt << id << spec.name << (float) (spec.gain * params.gain)
-                       << (u8) params.type << pos << params.object << params.loop;
+       pkt << id << spec.name << gain
+                       << (u8) params.type << pos << params.object
+                       << params.loop << params.fade << params.pitch;
+
+       // Backwards compability
+       bool play_sound = gain > 0;
 
-       for(std::vector<u16>::iterator i = dst_clients.begin();
+       for (std::vector<u16>::iterator i = dst_clients.begin();
                        i != dst_clients.end(); ++i) {
-               psound.clients.insert(*i);
-               m_clients.send(*i, 0, &pkt, true);
+               if (play_sound || m_clients.getProtocolVersion(*i) >= 32) {
+                       psound.clients.insert(*i);
+                       m_clients.send(*i, 0, &pkt, true);
+               }
        }
        return id;
 }
 void Server::stopSound(s32 handle)
 {
        // Get sound reference
-       std::map<s32, ServerPlayingSound>::iterator i =
-                       m_playing_sounds.find(handle);
-       if(i == m_playing_sounds.end())
+       std::unordered_map<s32, ServerPlayingSound>::iterator i =
+               m_playing_sounds.find(handle);
+       if (i == m_playing_sounds.end())
                return;
        ServerPlayingSound &psound = i->second;
 
        NetworkPacket pkt(TOCLIENT_STOP_SOUND, 4);
        pkt << handle;
 
-       for(std::set<u16>::iterator i = psound.clients.begin();
-                       i != psound.clients.end(); ++i) {
+       for (std::unordered_set<u16>::const_iterator si = psound.clients.begin();
+                       si != psound.clients.end(); ++si) {
                // Send as reliable
-               m_clients.send(*i, 0, &pkt, true);
+               m_clients.send(*si, 0, &pkt, true);
        }
        // Remove sound reference
        m_playing_sounds.erase(i);
 }
 
+void Server::fadeSound(s32 handle, float step, float gain)
+{
+       // Get sound reference
+       std::unordered_map<s32, ServerPlayingSound>::iterator i =
+               m_playing_sounds.find(handle);
+       if (i == m_playing_sounds.end())
+               return;
+
+       ServerPlayingSound &psound = i->second;
+       psound.params.gain = gain;
+
+       NetworkPacket pkt(TOCLIENT_FADE_SOUND, 4);
+       pkt << handle << step << gain;
+
+       // Backwards compability
+       bool play_sound = gain > 0;
+       ServerPlayingSound compat_psound = psound;
+       compat_psound.clients.clear();
+
+       NetworkPacket compat_pkt(TOCLIENT_STOP_SOUND, 4);
+       compat_pkt << handle;
+
+       for (std::unordered_set<u16>::iterator it = psound.clients.begin();
+                       it != psound.clients.end();) {
+               if (m_clients.getProtocolVersion(*it) >= 32) {
+                       // Send as reliable
+                       m_clients.send(*it, 0, &pkt, true);
+                       ++it;
+               } else {
+                       compat_psound.clients.insert(*it);
+                       // Stop old sound
+                       m_clients.send(*it, 0, &compat_pkt, true);
+                       psound.clients.erase(it++);
+               }
+       }
+
+       // Remove sound reference
+       if (!play_sound || psound.clients.size() == 0)
+               m_playing_sounds.erase(i);
+
+       if (play_sound && compat_psound.clients.size() > 0) {
+               // Play new sound volume on older clients
+               playSound(compat_psound.spec, compat_psound.params);
+       }
+}
+
 void Server::sendRemoveNode(v3s16 p, u16 ignore_id,
        std::vector<u16> *far_players, float far_d_nodes)
 {
@@ -2046,14 +2164,17 @@ void Server::sendRemoveNode(v3s16 p, u16 ignore_id,
        pkt << p;
 
        std::vector<u16> clients = m_clients.getClientIDs();
-       for(std::vector<u16>::iterator i = clients.begin();
-               i != clients.end(); ++i) {
+       for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) {
                if (far_players) {
                        // Get player
-                       if(Player *player = m_env->getPlayer(*i)) {
+                       if (RemotePlayer *player = m_env->getPlayer(*i)) {
+                               PlayerSAO *sao = player->getPlayerSAO();
+                               if (!sao)
+                                       continue;
+
                                // If player is far away, only set modified blocks not sent
-                               v3f player_pos = player->getPosition();
-                               if(player_pos.getDistanceFrom(p_f) > maxd) {
+                               v3f player_pos = sao->getBasePosition();
+                               if (player_pos.getDistanceFrom(p_f) > maxd) {
                                        far_players->push_back(*i);
                                        continue;
                                }
@@ -2073,14 +2194,16 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id,
        v3f p_f = intToFloat(p, BS);
 
        std::vector<u16> clients = m_clients.getClientIDs();
-       for(std::vector<u16>::iterator i = clients.begin();
-                       i != clients.end(); ++i) {
-
-               if(far_players) {
+       for(std::vector<u16>::iterator i = clients.begin();     i != clients.end(); ++i) {
+               if (far_players) {
                        // Get player
-                       if(Player *player = m_env->getPlayer(*i)) {
+                       if (RemotePlayer *player = m_env->getPlayer(*i)) {
+                               PlayerSAO *sao = player->getPlayerSAO();
+                               if (!sao)
+                                       continue;
+
                                // If player is far away, only set modified blocks not sent
-                               v3f player_pos = player->getPosition();
+                               v3f player_pos = sao->getBasePosition();
                                if(player_pos.getDistanceFrom(p_f) > maxd) {
                                        far_players->push_back(*i);
                                        continue;
@@ -2094,14 +2217,6 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id,
                if (client != 0) {
                        pkt << p << n.param0 << n.param1 << n.param2
                                        << (u8) (remove_metadata ? 0 : 1);
-
-                       if (!remove_metadata) {
-                               if (client->net_proto_version <= 21) {
-                                       // Old clients always clear metadata; fix it
-                                       // by sending the full block again.
-                                       client->SetBlockNotSent(getNodeBlockPos(p));
-                               }
-                       }
                }
                m_clients.unlock();
 
@@ -2135,7 +2250,7 @@ void Server::SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver, u16 net_proto
 
        std::ostringstream os(std::ios_base::binary);
        block->serialize(os, ver, false);
-       block->serializeNetworkSpecific(os, net_proto_version);
+       block->serializeNetworkSpecific(os);
        std::string s = os.str();
 
        NetworkPacket pkt(TOCLIENT_BLOCKDATA, 2 + 2 + 2 + 2 + s.size(), peer_id);
@@ -2324,7 +2439,7 @@ void Server::sendMediaAnnouncement(u16 peer_id)
        NetworkPacket pkt(TOCLIENT_ANNOUNCE_MEDIA, 0, peer_id);
        pkt << (u16) m_media.size();
 
-       for (std::map<std::string, MediaInfo>::iterator i = m_media.begin();
+       for (std::unordered_map<std::string, MediaInfo>::iterator i = m_media.begin();
                        i != m_media.end(); ++i) {
                pkt << i->first << i->second.sha1_digest;
        }
@@ -2369,7 +2484,7 @@ void Server::sendRequestedMedia(u16 peer_id,
                        i != tosend.end(); ++i) {
                const std::string &name = *i;
 
-               if(m_media.find(name) == m_media.end()) {
+               if (m_media.find(name) == m_media.end()) {
                        errorstream<<"Server::sendRequestedMedia(): Client asked for "
                                        <<"unknown file \""<<(name)<<"\""<<std::endl;
                        continue;
@@ -2472,11 +2587,16 @@ void Server::sendDetachedInventory(const std::string &name, u16 peer_id)
        NetworkPacket pkt(TOCLIENT_DETACHED_INVENTORY, 0, peer_id);
        pkt.putRawString(s.c_str(), s.size());
 
-       if (peer_id != PEER_ID_INEXISTENT) {
-               Send(&pkt);
-       }
-       else {
-               m_clients.sendToAll(0, &pkt, true);
+       const std::string &check = m_detached_inventories_player[name];
+       if (peer_id == PEER_ID_INEXISTENT) {
+               if (check == "")
+                       return m_clients.sendToAll(&pkt);
+               RemotePlayer *p = m_env->getPlayer(check.c_str());
+               if (p)
+                       m_clients.send(p->peer_id, 0, &pkt, true);
+       } else {
+               if (check == "" || getPlayerName(peer_id) == check)
+                       Send(&pkt);
        }
 }
 
@@ -2500,9 +2620,11 @@ void Server::sendDetachedInventories(u16 peer_id)
 void Server::DiePlayer(u16 peer_id)
 {
        DSTACK(FUNCTION_NAME);
-
        PlayerSAO *playersao = getPlayerSAO(peer_id);
-       assert(playersao);
+       // In some rare cases this can be NULL -- if the player is disconnected
+       // when a Lua function modifies l_punch, for example
+       if (!playersao)
+               return;
 
        infostream << "Server::DiePlayer(): Player "
                        << playersao->getPlayer()->getName()
@@ -2531,15 +2653,13 @@ void Server::RespawnPlayer(u16 peer_id)
        playersao->setHP(PLAYER_MAX_HP);
        playersao->setBreath(PLAYER_MAX_BREATH);
 
-       SendPlayerHP(peer_id);
-       SendPlayerBreath(peer_id);
-
        bool repositioned = m_script->on_respawnplayer(playersao);
-       if(!repositioned){
-               v3f pos = findSpawnPos();
+       if (!repositioned) {
                // setPos will send the new position to client
-               playersao->setPos(pos);
+               playersao->setPos(findSpawnPos());
        }
+
+       SendPlayerHP(peer_id);
 }
 
 
@@ -2556,7 +2676,7 @@ void Server::DenyAccessVerCompliant(u16 peer_id, u16 proto_ver, AccessDeniedCode
                const std::string &str_reason, bool reconnect)
 {
        if (proto_ver >= 25) {
-               SendAccessDenied(peer_id, reason, str_reason);
+               SendAccessDenied(peer_id, reason, str_reason, reconnect);
        } else {
                std::wstring wreason = utf8_to_wide(
                        reason == SERVER_ACCESSDENIED_CUSTOM_STRING ? str_reason :
@@ -2628,44 +2748,32 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
                /*
                        Clear references to playing sounds
                */
-               for(std::map<s32, ServerPlayingSound>::iterator
-                               i = m_playing_sounds.begin();
-                               i != m_playing_sounds.end();)
-               {
+               for (std::unordered_map<s32, ServerPlayingSound>::iterator
+                                i = m_playing_sounds.begin(); i != m_playing_sounds.end();) {
                        ServerPlayingSound &psound = i->second;
                        psound.clients.erase(peer_id);
-                       if(psound.clients.empty())
+                       if (psound.clients.empty())
                                m_playing_sounds.erase(i++);
                        else
                                ++i;
                }
 
-               Player *player = m_env->getPlayer(peer_id);
-
-               // Collect information about leaving in chat
-               {
-                       if(player != NULL && reason != CDR_DENY)
-                       {
-                               std::wstring name = narrow_to_wide(player->getName());
-                               message += L"*** ";
-                               message += name;
-                               message += L" left the game.";
-                               if(reason == CDR_TIMEOUT)
-                                       message += L" (timed out)";
-                       }
-               }
+               RemotePlayer *player = m_env->getPlayer(peer_id);
 
                /* Run scripts and remove from environment */
-               {
-                       if(player != NULL)
-                       {
-                               PlayerSAO *playersao = player->getPlayerSAO();
-                               assert(playersao);
-
-                               m_script->on_leaveplayer(playersao);
-
-                               playersao->disconnected();
-                       }
+               if (player != NULL) {
+                       PlayerSAO *playersao = player->getPlayerSAO();
+                       assert(playersao);
+
+                       // inform connected clients
+                       NetworkPacket notice(TOCLIENT_UPDATE_PLAYER_LIST, 0, PEER_ID_INEXISTENT);
+                       // (u16) 1 + std::string represents a vector serialization representation
+                       notice << (u8) PLAYER_LIST_REMOVE  << (u16) 1 << std::string(playersao->getPlayer()->getName());
+                       m_clients.sendToAll(&notice);
+                       // run scripts
+                       m_script->on_leaveplayer(playersao, reason == CDR_TIMEOUT);
+
+                       playersao->disconnected();
                }
 
                /*
@@ -2679,17 +2787,21 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
                                for(std::vector<u16>::iterator i = clients.begin();
                                        i != clients.end(); ++i) {
                                        // Get player
-                                       Player *player = m_env->getPlayer(*i);
-                                       if(!player)
+                                       RemotePlayer *player = m_env->getPlayer(*i);
+                                       if (!player)
                                                continue;
 
                                        // Get name of player
                                        os << player->getName() << " ";
                                }
 
-                               actionstream << player->getName() << " "
+                               std::string name = player->getName();
+                               actionstream << name << " "
                                                << (reason == CDR_TIMEOUT ? "times out." : "leaves game.")
                                                << " List of players: " << os.str() << std::endl;
+                               if (m_admin_chat)
+                                       m_admin_chat->outgoing_queue.push_back(
+                                               new ChatEventNick(CET_NICK_REMOVE, name));
                        }
                }
                {
@@ -2703,7 +2815,7 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
                SendChatMessage(PEER_ID_INEXISTENT,message);
 }
 
-void Server::UpdateCrafting(Player* player)
+void Server::UpdateCrafting(RemotePlayer *player)
 {
        DSTACK(FUNCTION_NAME);
 
@@ -2713,7 +2825,8 @@ void Server::UpdateCrafting(Player* player)
        loc.setPlayer(player->getName());
        std::vector<ItemStack> output_replacements;
        getCraftingResult(&player->inventory, preview, output_replacements, false, this);
-       m_env->getScriptIface()->item_CraftPredict(preview, player->getPlayerSAO(), (&player->inventory)->getList("craft"), loc);
+       m_env->getScriptIface()->item_CraftPredict(preview, player->getPlayerSAO(),
+                       (&player->inventory)->getList("craft"), loc);
 
        // Put the new preview in
        InventoryList *plist = player->inventory.getList("craftpreview");
@@ -2722,6 +2835,125 @@ void Server::UpdateCrafting(Player* player)
        plist->changeItem(0, preview);
 }
 
+void Server::handleChatInterfaceEvent(ChatEvent *evt)
+{
+       if (evt->type == CET_NICK_ADD) {
+               // The terminal informed us of its nick choice
+               m_admin_nick = ((ChatEventNick *)evt)->nick;
+               if (!m_script->getAuth(m_admin_nick, NULL, NULL)) {
+                       errorstream << "You haven't set up an account." << std::endl
+                               << "Please log in using the client as '"
+                               << m_admin_nick << "' with a secure password." << std::endl
+                               << "Until then, you can't execute admin tasks via the console," << std::endl
+                               << "and everybody can claim the user account instead of you," << std::endl
+                               << "giving them full control over this server." << std::endl;
+               }
+       } else {
+               assert(evt->type == CET_CHAT);
+               handleAdminChat((ChatEventChat *)evt);
+       }
+}
+
+std::wstring Server::handleChat(const std::string &name, const std::wstring &wname,
+       std::wstring wmessage, bool check_shout_priv, RemotePlayer *player)
+{
+       // If something goes wrong, this player is to blame
+       RollbackScopeActor rollback_scope(m_rollback,
+               std::string("player:") + name);
+
+       if (g_settings->getBool("strip_color_codes"))
+               wmessage = unescape_enriched(wmessage);
+
+       if (player) {
+               switch (player->canSendChatMessage()) {
+                       case RPLAYER_CHATRESULT_FLOODING: {
+                               std::wstringstream ws;
+                               ws << L"You cannot send more messages. You are limited to "
+                                  << g_settings->getFloat("chat_message_limit_per_10sec")
+                                  << L" messages per 10 seconds.";
+                               return ws.str();
+                       }
+                       case RPLAYER_CHATRESULT_KICK:
+                               DenyAccess_Legacy(player->peer_id,
+                                               L"You have been kicked due to message flooding.");
+                               return L"";
+                       case RPLAYER_CHATRESULT_OK:
+                               break;
+                       default:
+                               FATAL_ERROR("Unhandled chat filtering result found.");
+               }
+       }
+
+       if (m_max_chatmessage_length > 0
+                       && wmessage.length() > m_max_chatmessage_length) {
+               return L"Your message exceed the maximum chat message limit set on the server. "
+                               L"It was refused. Send a shorter message";
+       }
+
+       // Run script hook, exit if script ate the chat message
+       if (m_script->on_chat_message(name, wide_to_utf8(wmessage)))
+               return L"";
+
+       // Line to send
+       std::wstring line;
+       // Whether to send line to the player that sent the message, or to all players
+       bool broadcast_line = true;
+
+       if (check_shout_priv && !checkPriv(name, "shout")) {
+               line += L"-!- You don't have permission to shout.";
+               broadcast_line = false;
+       } else {
+               line += L"<";
+               line += wname;
+               line += L"> ";
+               line += wmessage;
+       }
+
+       /*
+               Tell calling method to send the message to sender
+       */
+       if (!broadcast_line) {
+               return line;
+       } else {
+               /*
+                       Send the message to others
+               */
+               actionstream << "CHAT: " << wide_to_narrow(unescape_enriched(line)) << std::endl;
+
+               std::vector<u16> clients = m_clients.getClientIDs();
+
+               /*
+                       Send the message back to the inital sender
+                       if they are using protocol version >= 29
+               */
+
+               u16 peer_id_to_avoid_sending = (player ? player->peer_id : PEER_ID_INEXISTENT);
+               if (player && player->protocol_version >= 29)
+                       peer_id_to_avoid_sending = PEER_ID_INEXISTENT;
+
+               for (u16 i = 0; i < clients.size(); i++) {
+                       u16 cid = clients[i];
+                       if (cid != peer_id_to_avoid_sending)
+                               SendChatMessage(cid, line);
+               }
+       }
+       return L"";
+}
+
+void Server::handleAdminChat(const ChatEventChat *evt)
+{
+       std::string name = evt->nick;
+       std::wstring wname = utf8_to_wide(name);
+       std::wstring wmessage = evt->evt_msg;
+
+       std::wstring answer = handleChat(name, wname, wmessage);
+
+       // If asked to send answer to sender
+       if (!answer.empty()) {
+               m_admin_chat->outgoing_queue.push_back(new ChatEventChat("", answer));
+       }
+}
+
 RemoteClient* Server::getClient(u16 peer_id, ClientState state_min)
 {
        RemoteClient *client = getClientNoEx(peer_id,state_min);
@@ -2737,16 +2969,16 @@ RemoteClient* Server::getClientNoEx(u16 peer_id, ClientState state_min)
 
 std::string Server::getPlayerName(u16 peer_id)
 {
-       Player *player = m_env->getPlayer(peer_id);
-       if(player == NULL)
+       RemotePlayer *player = m_env->getPlayer(peer_id);
+       if (player == NULL)
                return "[id="+itos(peer_id)+"]";
        return player->getName();
 }
 
 PlayerSAO* Server::getPlayerSAO(u16 peer_id)
 {
-       Player *player = m_env->getPlayer(peer_id);
-       if(player == NULL)
+       RemotePlayer *player = m_env->getPlayer(peer_id);
+       if (player == NULL)
                return NULL;
        return player->getPlayerSAO();
 }
@@ -2765,13 +2997,12 @@ std::wstring Server::getStatusString()
        bool first = true;
        os<<L", clients={";
        std::vector<u16> clients = m_clients.getClientIDs();
-       for(std::vector<u16>::iterator i = clients.begin();
-               i != clients.end(); ++i) {
+       for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) {
                // Get player
-               Player *player = m_env->getPlayer(*i);
+               RemotePlayer *player = m_env->getPlayer(*i);
                // Get name of player
                std::wstring name = L"unknown";
-               if(player != NULL)
+               if (player != NULL)
                        name = narrow_to_wide(player->getName());
                // Add name to information string
                if(!first)
@@ -2807,12 +3038,12 @@ void Server::reportPrivsModified(const std::string &name)
                std::vector<u16> clients = m_clients.getClientIDs();
                for(std::vector<u16>::iterator i = clients.begin();
                                i != clients.end(); ++i) {
-                       Player *player = m_env->getPlayer(*i);
+                       RemotePlayer *player = m_env->getPlayer(*i);
                        reportPrivsModified(player->getName());
                }
        } else {
-               Player *player = m_env->getPlayer(name.c_str());
-               if(!player)
+               RemotePlayer *player = m_env->getPlayer(name.c_str());
+               if (!player)
                        return;
                SendPlayerPrivileges(player->peer_id);
                PlayerSAO *sao = player->getPlayerSAO();
@@ -2826,8 +3057,8 @@ void Server::reportPrivsModified(const std::string &name)
 
 void Server::reportInventoryFormspecModified(const std::string &name)
 {
-       Player *player = m_env->getPlayer(name.c_str());
-       if(!player)
+       RemotePlayer *player = m_env->getPlayer(name.c_str());
+       if (!player)
                return;
        SendPlayerInventoryFormspec(player->peer_id);
 }
@@ -2853,9 +3084,14 @@ void Server::notifyPlayer(const char *name, const std::wstring &msg)
        if (!m_env)
                return;
 
-       Player *player = m_env->getPlayer(name);
-       if (!player)
+       if (m_admin_nick == name && !m_admin_nick.empty()) {
+               m_admin_chat->outgoing_queue.push_back(new ChatEventChat("", msg));
+       }
+
+       RemotePlayer *player = m_env->getPlayer(name);
+       if (!player) {
                return;
+       }
 
        if (player->peer_id == PEER_ID_INEXISTENT)
                return;
@@ -2870,7 +3106,7 @@ bool Server::showFormspec(const char *playername, const std::string &formspec,
        if (!m_env)
                return false;
 
-       Player *player = m_env->getPlayer(playername);
+       RemotePlayer *player = m_env->getPlayer(playername);
        if (!player)
                return false;
 
@@ -2878,7 +3114,7 @@ bool Server::showFormspec(const char *playername, const std::string &formspec,
        return true;
 }
 
-u32 Server::hudAdd(Player *player, HudElement *form)
+u32 Server::hudAdd(RemotePlayer *player, HudElement *form)
 {
        if (!player)
                return -1;
@@ -2890,7 +3126,7 @@ u32 Server::hudAdd(Player *player, HudElement *form)
        return id;
 }
 
-bool Server::hudRemove(Player *player, u32 id) {
+bool Server::hudRemove(RemotePlayer *player, u32 id) {
        if (!player)
                return false;
 
@@ -2905,7 +3141,7 @@ bool Server::hudRemove(Player *player, u32 id) {
        return true;
 }
 
-bool Server::hudChange(Player *player, u32 id, HudElementStat stat, void *data)
+bool Server::hudChange(RemotePlayer *player, u32 id, HudElementStat stat, void *data)
 {
        if (!player)
                return false;
@@ -2914,13 +3150,14 @@ bool Server::hudChange(Player *player, u32 id, HudElementStat stat, void *data)
        return true;
 }
 
-bool Server::hudSetFlags(Player *player, u32 flags, u32 mask)
+bool Server::hudSetFlags(RemotePlayer *player, u32 flags, u32 mask)
 {
        if (!player)
                return false;
 
        SendHUDSetFlags(player->peer_id, flags, mask);
-       player->hud_flags = flags;
+       player->hud_flags &= ~mask;
+       player->hud_flags |= flags;
 
        PlayerSAO* playersao = player->getPlayerSAO();
 
@@ -2931,10 +3168,11 @@ bool Server::hudSetFlags(Player *player, u32 flags, u32 mask)
        return true;
 }
 
-bool Server::hudSetHotbarItemcount(Player *player, s32 hotbar_itemcount)
+bool Server::hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount)
 {
        if (!player)
                return false;
+
        if (hotbar_itemcount <= 0 || hotbar_itemcount > HUD_HOTBAR_ITEMCOUNT_MAX)
                return false;
 
@@ -2945,14 +3183,7 @@ bool Server::hudSetHotbarItemcount(Player *player, s32 hotbar_itemcount)
        return true;
 }
 
-s32 Server::hudGetHotbarItemcount(Player *player)
-{
-       if (!player)
-               return 0;
-       return player->getHotbarItemcount();
-}
-
-void Server::hudSetHotbarImage(Player *player, std::string name)
+void Server::hudSetHotbarImage(RemotePlayer *player, std::string name)
 {
        if (!player)
                return;
@@ -2961,14 +3192,14 @@ void Server::hudSetHotbarImage(Player *player, std::string name)
        SendHUDSetParam(player->peer_id, HUD_PARAM_HOTBAR_IMAGE, name);
 }
 
-std::string Server::hudGetHotbarImage(Player *player)
+std::string Server::hudGetHotbarImage(RemotePlayer *player)
 {
        if (!player)
                return "";
        return player->getHotbarImage();
 }
 
-void Server::hudSetHotbarSelectedImage(Player *player, std::string name)
+void Server::hudSetHotbarSelectedImage(RemotePlayer *player, std::string name)
 {
        if (!player)
                return;
@@ -2977,16 +3208,8 @@ void Server::hudSetHotbarSelectedImage(Player *player, std::string name)
        SendHUDSetParam(player->peer_id, HUD_PARAM_HOTBAR_SELECTED_IMAGE, name);
 }
 
-std::string Server::hudGetHotbarSelectedImage(Player *player)
-{
-       if (!player)
-               return "";
-
-       return player->getHotbarSelectedImage();
-}
-
-bool Server::setLocalPlayerAnimations(Player *player,
-       v2s32 animation_frames[4], f32 frame_speed)
+bool Server::setLocalPlayerAnimations(RemotePlayer *player,
+               v2s32 animation_frames[4], f32 frame_speed)
 {
        if (!player)
                return false;
@@ -2996,7 +3219,7 @@ bool Server::setLocalPlayerAnimations(Player *player,
        return true;
 }
 
-bool Server::setPlayerEyeOffset(Player *player, v3f first, v3f third)
+bool Server::setPlayerEyeOffset(RemotePlayer *player, v3f first, v3f third)
 {
        if (!player)
                return false;
@@ -3007,18 +3230,35 @@ bool Server::setPlayerEyeOffset(Player *player, v3f first, v3f third)
        return true;
 }
 
-bool Server::setSky(Player *player, const video::SColor &bgcolor,
-       const std::string &type, const std::vector<std::string> &params)
+bool Server::setSky(RemotePlayer *player, const video::SColor &bgcolor,
+       const std::string &type, const std::vector<std::string> &params,
+       bool &clouds)
+{
+       if (!player)
+               return false;
+
+       player->setSky(bgcolor, type, params, clouds);
+       SendSetSky(player->peer_id, bgcolor, type, params, clouds);
+       return true;
+}
+
+bool Server::setClouds(RemotePlayer *player, float density,
+       const video::SColor &color_bright,
+       const video::SColor &color_ambient,
+       float height,
+       float thickness,
+       const v2f &speed)
 {
        if (!player)
                return false;
 
-       player->setSky(bgcolor, type, params);
-       SendSetSky(player->peer_id, bgcolor, type, params);
+       SendCloudParams(player->peer_id, density,
+                       color_bright, color_ambient, height,
+                       thickness, speed);
        return true;
 }
 
-bool Server::overrideDayNightRatio(Player *player, bool do_override,
+bool Server::overrideDayNightRatio(RemotePlayer *player, bool do_override,
        float ratio)
 {
        if (!player)
@@ -3037,59 +3277,62 @@ void Server::notifyPlayers(const std::wstring &msg)
 void Server::spawnParticle(const std::string &playername, v3f pos,
        v3f velocity, v3f acceleration,
        float expirationtime, float size, bool
-       collisiondetection, bool vertical, const std::string &texture)
+       collisiondetection, bool collision_removal,
+       bool vertical, const std::string &texture,
+       const struct TileAnimationParams &animation, u8 glow)
 {
        // m_env will be NULL if the server is initializing
        if (!m_env)
                return;
 
-       u16 peer_id = PEER_ID_INEXISTENT;
+       u16 peer_id = PEER_ID_INEXISTENT, proto_ver = 0;
        if (playername != "") {
-               Player* player = m_env->getPlayer(playername.c_str());
+               RemotePlayer *player = m_env->getPlayer(playername.c_str());
                if (!player)
                        return;
                peer_id = player->peer_id;
+               proto_ver = player->protocol_version;
        }
 
-       SendSpawnParticle(peer_id, pos, velocity, acceleration,
-                       expirationtime, size, collisiondetection, vertical, texture);
+       SendSpawnParticle(peer_id, proto_ver, pos, velocity, acceleration,
+                       expirationtime, size, collisiondetection,
+                       collision_removal, vertical, texture, animation, glow);
 }
 
 u32 Server::addParticleSpawner(u16 amount, float spawntime,
        v3f minpos, v3f maxpos, v3f minvel, v3f maxvel, v3f minacc, v3f maxacc,
        float minexptime, float maxexptime, float minsize, float maxsize,
-       bool collisiondetection, bool vertical, const std::string &texture,
-       const std::string &playername)
+       bool collisiondetection, bool collision_removal,
+       ServerActiveObject *attached, bool vertical, const std::string &texture,
+       const std::string &playername, const struct TileAnimationParams &animation,
+       u8 glow)
 {
        // m_env will be NULL if the server is initializing
        if (!m_env)
                return -1;
 
-       u16 peer_id = PEER_ID_INEXISTENT;
+       u16 peer_id = PEER_ID_INEXISTENT, proto_ver = 0;
        if (playername != "") {
-               Player* player = m_env->getPlayer(playername.c_str());
+               RemotePlayer *player = m_env->getPlayer(playername.c_str());
                if (!player)
                        return -1;
                peer_id = player->peer_id;
+               proto_ver = player->protocol_version;
        }
 
-       u32 id = 0;
-       for(;;) // look for unused particlespawner id
-       {
-               id++;
-               if (std::find(m_particlespawner_ids.begin(),
-                               m_particlespawner_ids.end(), id)
-                               == m_particlespawner_ids.end())
-               {
-                       m_particlespawner_ids.push_back(id);
-                       break;
-               }
-       }
+       u16 attached_id = attached ? attached->getId() : 0;
 
-       SendAddParticleSpawner(peer_id, amount, spawntime,
+       u32 id;
+       if (attached_id == 0)
+               id = m_env->addParticleSpawner(spawntime);
+       else
+               id = m_env->addParticleSpawner(spawntime, attached_id);
+
+       SendAddParticleSpawner(peer_id, proto_ver, amount, spawntime,
                minpos, maxpos, minvel, maxvel, minacc, maxacc,
                minexptime, maxexptime, minsize, maxsize,
-               collisiondetection, vertical, texture, id);
+               collisiondetection, collision_removal, attached_id, vertical,
+               texture, id, animation, glow);
 
        return id;
 }
@@ -3102,20 +3345,17 @@ void Server::deleteParticleSpawner(const std::string &playername, u32 id)
 
        u16 peer_id = PEER_ID_INEXISTENT;
        if (playername != "") {
-               Player* player = m_env->getPlayer(playername.c_str());
+               RemotePlayer *player = m_env->getPlayer(playername.c_str());
                if (!player)
                        return;
                peer_id = player->peer_id;
        }
 
-       m_particlespawner_ids.erase(
-                       std::remove(m_particlespawner_ids.begin(),
-                       m_particlespawner_ids.end(), id),
-                       m_particlespawner_ids.end());
+       m_env->deleteParticleSpawner(id);
        SendDeleteParticleSpawner(peer_id, id);
 }
 
-Inventory* Server::createDetachedInventory(const std::string &name)
+Inventory* Server::createDetachedInventory(const std::string &name, const std::string &player)
 {
        if(m_detached_inventories.count(name) > 0){
                infostream<<"Server clearing detached inventory \""<<name<<"\""<<std::endl;
@@ -3126,6 +3366,7 @@ Inventory* Server::createDetachedInventory(const std::string &name)
        Inventory *inv = new Inventory(m_itemdef);
        sanity_check(inv);
        m_detached_inventories[name] = inv;
+       m_detached_inventories_player[name] = player;
        //TODO find a better way to do this
        sendDetachedInventory(name,PEER_ID_INEXISTENT);
        return inv;
@@ -3194,29 +3435,12 @@ ICraftDefManager *Server::getCraftDefManager()
 {
        return m_craftdef;
 }
-ITextureSource *Server::getTextureSource()
-{
-       return NULL;
-}
-IShaderSource *Server::getShaderSource()
-{
-       return NULL;
-}
-scene::ISceneManager *Server::getSceneManager()
-{
-       return NULL;
-}
 
 u16 Server::allocateUnknownNodeId(const std::string &name)
 {
        return m_nodedef->allocateDummy(name);
 }
 
-ISoundManager *Server::getSoundManager()
-{
-       return &dummySoundManager;
-}
-
 MtEventManager *Server::getEventManager()
 {
        return m_event;
@@ -3260,6 +3484,11 @@ std::string Server::getBuiltinLuaPath()
        return porting::path_share + DIR_DELIM + "builtin";
 }
 
+std::string Server::getModStoragePath() const
+{
+       return m_path_world + DIR_DELIM + "mod_storage";
+}
+
 v3f Server::findSpawnPos()
 {
        ServerMap &map = m_env->getServerMap();
@@ -3268,26 +3497,26 @@ v3f Server::findSpawnPos()
                return nodeposf * BS;
        }
 
-       s16 water_level = map.getWaterLevel();
-       s16 vertical_spawn_range = g_settings->getS16("vertical_spawn_range");
        bool is_good = false;
+       // Limit spawn range to mapgen edges (determined by 'mapgen_limit')
+       s32 range_max = map.getMapgenParams()->getSpawnRangeMax();
 
        // Try to find a good place a few times
-       for(s32 i = 0; i < 1000 && !is_good; i++) {
-               s32 range = 1 + i;
+       for(s32 i = 0; i < 4000 && !is_good; i++) {
+               s32 range = MYMIN(1 + i, range_max);
                // We're going to try to throw the player to this position
                v2s16 nodepos2d = v2s16(
-                               -range + (myrand() % (range * 2)),
-                               -range + (myrand() % (range * 2)));
-
-               // Get ground height at point
-               s16 groundheight = map.findGroundLevel(nodepos2d);
-               // Don't go underwater or to high places
-               if (groundheight <= water_level ||
-                               groundheight > water_level + vertical_spawn_range)
+                       -range + (myrand() % (range * 2)),
+                       -range + (myrand() % (range * 2)));
+
+               // Get spawn level at point
+               s16 spawn_level = m_emerge->getSpawnLevelAtPoint(nodepos2d);
+               // Continue if MAX_MAP_GENERATION_LIMIT was returned by
+               // the mapgen to signify an unsuitable spawn position
+               if (spawn_level == MAX_MAP_GENERATION_LIMIT)
                        continue;
 
-               v3s16 nodepos(nodepos2d.X, groundheight, nodepos2d.Y);
+               v3s16 nodepos(nodepos2d.X, spawn_level, nodepos2d.Y);
 
                s32 air_count = 0;
                for (s32 i = 0; i < 10; i++) {
@@ -3312,18 +3541,52 @@ v3f Server::findSpawnPos()
        return nodeposf;
 }
 
-PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id, u16 proto_version)
+void Server::requestShutdown(const std::string &msg, bool reconnect, float delay)
 {
-       bool newplayer = false;
+       m_shutdown_timer = delay;
+       m_shutdown_msg = msg;
+       m_shutdown_ask_reconnect = reconnect;
+
+       if (delay == 0.0f) {
+       // No delay, shutdown immediately
+               m_shutdown_requested = true;
+               // only print to the infostream, a chat message saying
+               // "Server Shutting Down" is sent when the server destructs.
+               infostream << "*** Immediate Server shutdown requested." << std::endl;
+       } else if (delay < 0.0f && m_shutdown_timer > 0.0f) {
+       // Negative delay, cancel shutdown if requested
+               m_shutdown_timer = 0.0f;
+               m_shutdown_msg = "";
+               m_shutdown_ask_reconnect = false;
+               m_shutdown_requested = false;
+               std::wstringstream ws;
+
+               ws << L"*** Server shutdown canceled.";
+
+               infostream << wide_to_utf8(ws.str()).c_str() << std::endl;
+               SendChatMessage(PEER_ID_INEXISTENT, ws.str());
+       } else if (delay > 0.0f) {
+       // Positive delay, tell the clients when the server will shut down
+               std::wstringstream ws;
+
+               ws << L"*** Server shutting down in "
+                               << duration_to_string(myround(m_shutdown_timer)).c_str()
+                               << ".";
 
+               infostream << wide_to_utf8(ws.str()).c_str() << std::endl;
+               SendChatMessage(PEER_ID_INEXISTENT, ws.str());
+       }
+}
+
+PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id, u16 proto_version)
+{
        /*
                Try to get an existing player
        */
-       RemotePlayer *player = static_cast<RemotePlayer*>(m_env->getPlayer(name));
+       RemotePlayer *player = m_env->getPlayer(name);
 
        // If player is already connected, cancel
-       if(player != NULL && player->peer_id != 0)
-       {
+       if (player != NULL && player->peer_id != 0) {
                infostream<<"emergePlayer(): Player already connected"<<std::endl;
                return NULL;
        }
@@ -3331,58 +3594,25 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id, u16 proto_version
        /*
                If player with the wanted peer_id already exists, cancel.
        */
-       if(m_env->getPlayer(peer_id) != NULL)
-       {
+       if (m_env->getPlayer(peer_id) != NULL) {
                infostream<<"emergePlayer(): Player with wrong name but same"
                                " peer_id already exists"<<std::endl;
                return NULL;
        }
 
-       // Load player if it isn't already loaded
        if (!player) {
-               player = static_cast<RemotePlayer*>(m_env->loadPlayer(name));
+               player = new RemotePlayer(name, idef());
        }
 
-       // Create player if it doesn't exist
-       if (!player) {
-               newplayer = true;
-               player = new RemotePlayer(this, name);
-               // Set player position
-               infostream<<"Server: Finding spawn place for player \""
-                               <<name<<"\""<<std::endl;
-               v3f pos = findSpawnPos();
-               player->setPosition(pos);
-
-               // Make sure the player is saved
-               player->setModified(true);
-
-               // Add player to environment
-               m_env->addPlayer(player);
-       } else {
-               // If the player exists, ensure that they respawn inside legal bounds
-               // This fixes an assert crash when the player can't be added
-               // to the environment
-               if (objectpos_over_limit(player->getPosition())) {
-                       actionstream << "Respawn position for player \""
-                               << name << "\" outside limits, resetting" << std::endl;
-                       v3f pos = findSpawnPos();
-                       player->setPosition(pos);
-               }
-       }
+       bool newplayer = false;
 
-       // Create a new player active object
-       PlayerSAO *playersao = new PlayerSAO(m_env, player, peer_id,
-                       getPlayerEffectivePrivs(player->getName()),
-                       isSingleplayer());
+       // Load player
+       PlayerSAO *playersao = m_env->loadPlayer(player, &newplayer, peer_id, isSingleplayer());
 
+       // Complete init with server parts
+       playersao->finalize(player, getPlayerEffectivePrivs(player->getName()));
        player->protocol_version = proto_version;
 
-       /* Clean up old HUD elements from previous sessions */
-       player->clearHud();
-
-       /* Add object to environment */
-       m_env->addActiveObject(playersao);
-
        /* Run scripts */
        if (newplayer) {
                m_script->on_newplayer(playersao);
@@ -3391,6 +3621,28 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id, u16 proto_version
        return playersao;
 }
 
+bool Server::registerModStorage(ModMetadata *storage)
+{
+       if (m_mod_storages.find(storage->getModName()) != m_mod_storages.end()) {
+               errorstream << "Unable to register same mod storage twice. Storage name: "
+                               << storage->getModName() << std::endl;
+               return false;
+       }
+
+       m_mod_storages[storage->getModName()] = storage;
+       return true;
+}
+
+void Server::unregisterModStorage(const std::string &name)
+{
+       std::unordered_map<std::string, ModMetadata *>::const_iterator it = m_mod_storages.find(name);
+       if (it != m_mod_storages.end()) {
+               // Save unconditionaly on unregistration
+               it->second->save(getModStoragePath());
+               m_mod_storages.erase(name);
+       }
+}
+
 void dedicated_server_loop(Server &server, bool &kill)
 {
        DSTACK(FUNCTION_NAME);
@@ -3399,9 +3651,12 @@ void dedicated_server_loop(Server &server, bool &kill)
 
        IntervalLimiter m_profiler_interval;
 
-       for(;;)
-       {
-               float steplen = g_settings->getFloat("dedicated_server_step");
+       static thread_local const float steplen =
+                       g_settings->getFloat("dedicated_server_step");
+       static thread_local const float profiler_print_interval =
+                       g_settings->getFloat("profiler_print_interval");
+
+       for(;;) {
                // This is kind of a hack but can be done like this
                // because server.step() is very light
                {
@@ -3410,23 +3665,13 @@ void dedicated_server_loop(Server &server, bool &kill)
                }
                server.step(steplen);
 
-               if(server.getShutdownRequested() || kill)
-               {
-                       infostream<<"Dedicated server quitting"<<std::endl;
-#if USE_CURL
-                       if(g_settings->getBool("server_announce"))
-                               ServerList::sendAnnounce("delete", server.m_bind_addr.getPort());
-#endif
+               if (server.getShutdownRequested() || kill)
                        break;
-               }
 
                /*
                        Profiler
                */
-               float profiler_print_interval =
-                               g_settings->getFloat("profiler_print_interval");
-               if(profiler_print_interval != 0)
-               {
+               if (profiler_print_interval != 0) {
                        if(m_profiler_interval.step(steplen, profiler_print_interval))
                        {
                                infostream<<"Profiler:"<<std::endl;
@@ -3435,4 +3680,11 @@ void dedicated_server_loop(Server &server, bool &kill)
                        }
                }
        }
+
+       infostream << "Dedicated server quitting" << std::endl;
+#if USE_CURL
+       if (g_settings->getBool("server_announce"))
+               ServerList::sendAnnounce(ServerList::AA_DELETE,
+                       server.m_bind_addr.getPort());
+#endif
 }