oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

Send Inventory packet on event, don't check it at each AsyncRunStep.

Browse source 
* Call UpdateCrafting into SendInventory because this functions is only called before SendInventory
* Use Player* instead of peer_id for UpdateCrafting because SendInventory already has the Player* pointer, then don't loop for searching Player* per peer_id
* m_env_mutex don't need to be used with this modification because it's already locked before the calls
This commit is contained in:
Loic Blot 2015-03-04 11:29:34 +01:00
parent 038d3a31df
commit 1b2f64473e
7 changed files with 17 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/server.cpp
View file

@ -609,14 +609,6 @@ void Server::AsyncRunStep(bool initial_step)
SendMovePlayer(*i);
playersao->m_moved = false;
}
/*
Send player inventories if necessary
*/
if(playersao->m_inventory_not_sent) {
UpdateCrafting(*i);
SendInventory(*i);
}
}
}
@ -1164,7 +1156,6 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
SendPlayerInventoryFormspec(peer_id);
// Send inventory
UpdateCrafting(peer_id);
SendInventory(peer_id);
// Send HP
@ -1385,7 +1376,8 @@ void Server::setInventoryModified(const InventoryLocation &loc)
PlayerSAO *playersao = player->getPlayerSAO();
if(!playersao)
return;
playersao->m_inventory_not_sent = true;
SendInventory(playersao->getPeerID());
}
break;
case InventoryLocation::NODEMETA:
@ -1650,7 +1642,7 @@ void Server::SendInventory(u16 peer_id)
PlayerSAO *playersao = getPlayerSAO(peer_id);
assert(playersao);
playersao->m_inventory_not_sent = false;
UpdateCrafting(playersao->getPlayer());
/*
Serialize it
@ -2701,13 +2693,10 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
SendChatMessage(PEER_ID_INEXISTENT,message);
}
void Server::UpdateCrafting(u16 peer_id)
void Server::UpdateCrafting(Player* player)
{
DSTACK(__FUNCTION_NAME);
Player* player = m_env->getPlayer(peer_id);
assert(player);
// Get a preview for crafting
ItemStack preview;
InventoryLocation loc;