minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

We always know playerSAO when calling SendInventory. Using it instead of searching it via peer_id

This commit is contained in:
Loic Blot 2015-03-04 15:27:53 +01:00
parent bbed01ab62
commit 7e088fdfe3
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/packethandlers/server.cpp
View File

@ -1391,7 +1391,7 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
// Apply returned ItemStack
if (playersao->setWieldedItem(item)) {
SendInventory(pkt->getPeerId());
SendInventory(playersao);
}
}

2
src/script/lua_api/l_object.cpp
View File

@ -356,7 +356,7 @@ int ObjectRef::l_set_wielded_item(lua_State *L)
ItemStack item = read_item(L, 2, getServer(L));
bool success = co->setWieldedItem(item);
if (success && co->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
getServer(L)->SendInventory(((PlayerSAO*)co)->getPeerID());
getServer(L)->SendInventory(((PlayerSAO*)co));
}
lua_pushboolean(L, success);
return 1;

18
src/server.cpp
View File

@ -1125,7 +1125,7 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
SendPlayerInventoryFormspec(peer_id);
// Send inventory
SendInventory(peer_id);
SendInventory(playersao);
// Send HP
if(g_settings->getBool("enable_damage"))
@ -1329,6 +1329,7 @@ Inventory* Server::getInventory(const InventoryLocation &loc)
break;
default:
assert(0);
break;
}
return NULL;
}
@ -1346,7 +1347,7 @@ void Server::setInventoryModified(const InventoryLocation &loc)
if(!playersao)
return;
SendInventory(playersao->getPeerID());
SendInventory(playersao);
}
break;
case InventoryLocation::NODEMETA:
@ -1367,6 +1368,7 @@ void Server::setInventoryModified(const InventoryLocation &loc)
break;
default:
assert(0);
break;
}
}
@ -1604,23 +1606,21 @@ void Server::SendNodeDef(u16 peer_id,
Non-static send methods
*/
void Server::SendInventory(u16 peer_id)
void Server::SendInventory(PlayerSAO* playerSAO)
{
DSTACK(__FUNCTION_NAME);
PlayerSAO *playersao = getPlayerSAO(peer_id);
assert(playersao);
UpdateCrafting(playersao->getPlayer());
UpdateCrafting(playerSAO->getPlayer());
/*
Serialize it
*/
NetworkPacket* pkt = new NetworkPacket(TOCLIENT_INVENTORY, 0, peer_id);
NetworkPacket* pkt = new NetworkPacket(TOCLIENT_INVENTORY, 0,
playerSAO->getPeerID());
std::ostringstream os;
playersao->getInventory()->serialize(os);
playerSAO->getInventory()->serialize(os);
std::string s = os.str();

2
src/server.h
View File

@ -374,7 +374,7 @@ public:
void SendPlayerHPOrDie(u16 peer_id, bool die) { die ? DiePlayer(peer_id) : SendPlayerHP(peer_id); }
void SendPlayerBreath(u16 peer_id);
void SendInventory(u16 peer_id);
void SendInventory(PlayerSAO* playerSAO);
void SendMovePlayer(u16 peer_id);
// Bind address