Rename Scripting API files for consistency

[minetest.git] / src / network / serverpackethandler.cpp

diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index e0ea4bf83190428c746846995a042c1a7ff940c3..5b026bbdb03dffb3d27fcdaf60866efe8b07fe94 100644 (file)
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodedef.h"
 #include "player.h"
 #include "rollback_interface.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
 #include "settings.h"
 #include "tool.h"
 #include "version.h"
@@ -674,10 +674,6 @@ void Server::handleCommand_RequestMedia(NetworkPacket* pkt)
        sendRequestedMedia(pkt->getPeerId(), tosend);
 }
 
-void Server::handleCommand_ReceivedMedia(NetworkPacket* pkt)
-{
-}
-
 void Server::handleCommand_ClientReady(NetworkPacket* pkt)
 {
        u16 peer_id = pkt->getPeerId();
@@ -722,6 +718,13 @@ void Server::handleCommand_ClientReady(NetworkPacket* pkt)
 
        m_clients.event(peer_id, CSE_SetClientReady);
        m_script->on_joinplayer(playersao);
+       // Send shutdown timer if shutdown has been scheduled
+       if (m_shutdown_timer > 0.0f) {
+               std::wstringstream ws;
+               ws << L"*** Server shutting down in "
+                               << duration_to_string(myround(m_shutdown_timer)).c_str() << ".";
+               SendChatMessage(pkt->getPeerId(), ws.str());
+       }
 }
 
 void Server::handleCommand_GotBlocks(NetworkPacket* pkt)
@@ -1107,6 +1110,13 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)
        }
 
        if (g_settings->getBool("enable_damage")) {
+               if (playersao->isDead()) {
+                       verbosestream << "Server::ProcessData(): Info: "
+                               "Ignoring damage as player " << player->getName()
+                               << " is already dead." << std::endl;
+                       return;
+               }
+
                actionstream << player->getName() << " damaged by "
                                << (int)damage << " hp at " << PP(playersao->getBasePosition() / BS)
                                << std::endl;
@@ -1375,7 +1385,10 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
                const ItemDefinition &playeritem_def =
                        playersao->getWieldedItem().getDefinition(m_itemdef);
                float max_d = BS * playeritem_def.range;
-               float max_d_hand = BS * m_itemdef->get("").range;
+               InventoryList *hlist = playersao->getInventory()->getList("hand");
+               const ItemDefinition &hand_def =
+                       hlist ? (hlist->getItem(0).getDefinition(m_itemdef)) : (m_itemdef->get(""));
+               float max_d_hand = BS * hand_def.range;
                if (max_d < 0 && max_d_hand >= 0)
                        max_d = max_d_hand;
                else if (max_d < 0)
@@ -1436,7 +1449,7 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
                                        <<pointed.object_id<<": "
                                        <<pointed_object->getDescription()<<std::endl;
 
-                       ItemStack punchitem = playersao->getWieldedItem();
+                       ItemStack punchitem = playersao->getWieldedItemOrHand();
                        ToolCapabilities toolcap =
                                        punchitem.getToolCapabilities(m_itemdef);
                        v3f dir = (pointed_object->getBasePosition() -
@@ -1503,7 +1516,7 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
                                        m_script->on_cheat(playersao, "finished_unknown_dig");
                                }
                                // Get player's wielded item
-                               ItemStack playeritem = playersao->getWieldedItem();
+                               ItemStack playeritem = playersao->getWieldedItemOrHand();
                                ToolCapabilities playeritem_toolcap =
                                                playeritem.getToolCapabilities(m_itemdef);
                                // Get diggability and expected digging time
@@ -1511,7 +1524,9 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
                                                &playeritem_toolcap);
                                // If can't dig, try hand
                                if (!params.diggable) {
-                                       const ItemDefinition &hand = m_itemdef->get("");
+                                       InventoryList *hlist = playersao->getInventory()->getList("hand");
+                                       const ItemDefinition &hand =
+                                               hlist ? hlist->getItem(0).getDefinition(m_itemdef) : m_itemdef->get("");
                                        const ToolCapabilities *tp = hand.tool_capabilities;
                                        if (tp)
                                                params = getDigParams(m_nodedef->get(n).groups, tp);