fix: some getUserdataShared and transfer house (sell)

opentibiabr · Sep 23, 2023 · e6a3655 · e6a3655
1 parent 6be36bd
commit e6a3655
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/src/lua/functions/creatures/npc/npc_type_functions.cpp b/src/lua/functions/creatures/npc/npc_type_functions.cpp
@@ -191,7 +191,7 @@ int NpcTypeFunctions::luaNpcTypeAddShopItem(lua_State* L) {
 		return 1;
 	}
 
-	Shop* shop = getUserdata<Shop>(L, 2);
+	auto shop = getUserdataShared<Shop>(L, 2);
 	if (shop) {
 		npcType->loadShop(npcType, shop->shopBlock);
 		pushBoolean(L, true);

diff --git a/src/lua/functions/items/item_functions.cpp b/src/lua/functions/items/item_functions.cpp
@@ -846,7 +846,7 @@ int ItemFunctions::luaItemIsInsideDepot(lua_State* L) {
 
 int ItemFunctions::luaItemIsContainer(lua_State* L) {
 	// item:isContainer()
-	const auto item = getUserdata<const Item>(L, 1);
+	const auto item = getUserdataShared<const Item>(L, 1);
 	if (!item) {
 		reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND));
 		pushBoolean(L, false);

diff --git a/src/map/house/house.cpp b/src/map/house/house.cpp
@@ -363,18 +363,14 @@ std::shared_ptr<HouseTransferItem> House::getTransferItem() {
 		return nullptr;
 	}
 
-	transfer_container.resetParent();
 	transferItem = HouseTransferItem::createHouseTransferItem(static_self_cast<House>());
-	transfer_container.addThing(transferItem);
 	return transferItem;
 }
 
 void House::resetTransferItem() {
 	if (transferItem) {
 		std::shared_ptr<Item> tmpItem = transferItem;
 		transferItem = nullptr;
-		transfer_container.resetParent();
-		transfer_container.removeThing(tmpItem, tmpItem->getItemCount());
 	}
 }
 

diff --git a/src/map/house/house.hpp b/src/map/house/house.hpp
@@ -214,8 +214,6 @@ class House : public SharedObject {
 	AccessList guestList;
 	AccessList subOwnerList;
 
-	Container transfer_container { ITEM_LOCKER };
-
 	HouseTileList houseTiles;
 	std::list<std::shared_ptr<Door>> doorList;
 	HouseBedItemList bedsList;