diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-04 11:29:34 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-04 11:29:39 +0100 |
| commit | 1b2f64473ed4f222d3b7f02df853730d4382105e (patch) | |
| tree | 820e24b348438ce79dc5e183774e4bd091d2d3a9 /src/serverobject.cpp | |
| parent | 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f (diff) | |
| download | minetest-1b2f64473ed4f222d3b7f02df853730d4382105e.tar.gz minetest-1b2f64473ed4f222d3b7f02df853730d4382105e.tar.bz2 minetest-1b2f64473ed4f222d3b7f02df853730d4382105e.zip | |
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
Diffstat (limited to 'src/serverobject.cpp')
| -rw-r--r-- | src/serverobject.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
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; } } |