From 1b2f64473ed4f222d3b7f02df853730d4382105e Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Wed, 4 Mar 2015 11:29:34 +0100 Subject: Send Inventory packet on event, don't check it at each AsyncRunStep. * 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 --- src/serverobject.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/serverobject.cpp') diff --git a/src/serverobject.cpp b/src/serverobject.cpp index 9cf817859..699040bf2 100644 --- a/src/serverobject.cpp +++ b/src/serverobject.cpp @@ -90,14 +90,9 @@ ItemStack ServerActiveObject::getWieldedItem() const bool ServerActiveObject::setWieldedItem(const ItemStack &item) { - Inventory *inv = getInventory(); - if(inv) - { - InventoryList *list = inv->getList(getWieldList()); - if (list) - { + if(Inventory *inv = getInventory()) { + if (InventoryList *list = inv->getList(getWieldList())) { list->changeItem(getWieldIndex(), item); - setInventoryModified(); return true; } } -- cgit v1.2.3