Remove unused variable Client::m_active_blocks

[minetest.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index cb62f7e86115ffa12cd50472b2e403de11544afe..921dd14de4e6b9f3d3232cecc2640a8685c2767d 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -332,7 +332,7 @@ Server::Server(
        m_nodedef->setNodeRegistrationStatus(true);
 
        // Perform pending node name resolutions
-       m_nodedef->runNodeResolverCallbacks();
+       m_nodedef->runNodeResolveCallbacks();
 
        // init the recipe hashes to speed up crafting
        m_craftdef->initHashes(this);
@@ -1490,7 +1490,7 @@ void Server::SendBreath(u16 peer_id, u16 breath)
        Send(&pkt);
 }
 
-void Server::SendAccessDenied(u16 peer_id, AccessDeniedCode reason, const std::wstring &custom_reason)
+void Server::SendAccessDenied(u16 peer_id, AccessDeniedCode reason, const std::string &custom_reason)
 {
        DSTACK(__FUNCTION_NAME);
 
@@ -1802,7 +1802,11 @@ void Server::SendPlayerHP(u16 peer_id)
 {
        DSTACK(__FUNCTION_NAME);
        PlayerSAO *playersao = getPlayerSAO(peer_id);
-       assert(playersao);
+       // In some rare case, if the player is disconnected
+       // while Lua call l_punch, for example, this can be NULL
+       if (!playersao)
+               return;
+
        SendHP(peer_id, playersao->getHP());
        m_script->player_event(playersao,"health_changed");
 
@@ -1911,7 +1915,7 @@ void Server::SendActiveObjectMessages(u16 peer_id, const std::string &datas, boo
        pkt.putRawString(datas.c_str(), datas.size());
 
        m_clients.send(pkt.getPeerId(),
-                       clientCommandFactoryTable[pkt.getCommand()].channel,
+                       reliable ? clientCommandFactoryTable[pkt.getCommand()].channel : 1,
                        &pkt, reliable);
 
 }
@@ -2531,7 +2535,7 @@ void Server::RespawnPlayer(u16 peer_id)
        }
 }
 
-void Server::DenyAccess(u16 peer_id, AccessDeniedCode reason, const std::wstring &custom_reason)
+void Server::DenyAccess(u16 peer_id, AccessDeniedCode reason, const std::string &custom_reason)
 {
        DSTACK(__FUNCTION_NAME);