From 5fa614d97e13af64be490336392abe2a54fdcbc1 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Sat, 21 Sep 2019 11:44:24 +0200 Subject: Wieldhand: Specify which ItemStack to use (#8961) Makes 'get_wield_item' to return the "main" ItemStack --- src/serverobject.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'src/serverobject.cpp') diff --git a/src/serverobject.cpp b/src/serverobject.cpp index 4eebc0da4..1ed33f66b 100644 --- a/src/serverobject.cpp +++ b/src/serverobject.cpp @@ -68,25 +68,16 @@ float ServerActiveObject::getMinimumSavedMovement() return 2.0*BS; } -ItemStack ServerActiveObject::getWieldedItem() const +ItemStack ServerActiveObject::getWieldedItem(ItemStack *selected, ItemStack *hand) const { - const Inventory *inv = getInventory(); - if(inv) - { - const InventoryList *list = inv->getList(getWieldList()); - if(list && (getWieldIndex() < (s32)list->getSize())) - return list->getItem(getWieldIndex()); - } + *selected = ItemStack(); + if (hand) + *hand = ItemStack(); + return ItemStack(); } bool ServerActiveObject::setWieldedItem(const ItemStack &item) { - if(Inventory *inv = getInventory()) { - if (InventoryList *list = inv->getList(getWieldList())) { - list->changeItem(getWieldIndex(), item); - return true; - } - } return false; } -- cgit v1.2.3