Client-side prediction of inventory changes, and some inventory menu fixes

[minetest.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 177551881173e8d29ad5d4b3d5cac13f11bd37b7..a0c8a00928011740af8f9e862f7c03b6d3556871 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2372,6 +2372,11 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
                        return;
                }
 
+               /*
+                       Note: Always set inventory not sent, to repair cases
+                       where the client made a bad prediction.
+               */
+
                /*
                        Handle restrictions and special cases of the move action
                */
@@ -2382,6 +2387,9 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
                        ma->from_inv.applyCurrentPlayer(player->getName());
                        ma->to_inv.applyCurrentPlayer(player->getName());
 
+                       setInventoryModified(ma->from_inv);
+                       setInventoryModified(ma->to_inv);
+
                        bool from_inv_is_current_player =
                                (ma->from_inv.type == InventoryLocation::PLAYER) &&
                                (ma->from_inv.name == player->getName());
@@ -2461,6 +2469,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 
                        da->from_inv.applyCurrentPlayer(player->getName());
 
+                       setInventoryModified(da->from_inv);
+
                        // Disallow dropping items if not allowed to interact
                        if((getPlayerPrivs(player) & PRIV_INTERACT) == 0)
                        {
@@ -2490,6 +2500,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 
                        ca->craft_inv.applyCurrentPlayer(player->getName());
 
+                       setInventoryModified(ca->craft_inv);
+
                        //bool craft_inv_is_current_player =
                        //      (ca->craft_inv.type == InventoryLocation::PLAYER) &&
                        //      (ca->craft_inv.name == player->getName());