fix: remove imbuement check for empty slots

opentibiabr · Feb 15, 2025 · a43c3f8 · a43c3f8
1 parent ab32754
commit a43c3f8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/items/item.cpp b/src/items/item.cpp
@@ -91,8 +91,18 @@ std::shared_ptr<Item> Item::CreateItem(const uint16_t type, uint16_t count /*= 0
 	return newItem;
 }
 
+bool Item::hasImbuementAttribute(const std::string &attributeSlot) const {
+	// attributeSlot = ITEM_IMBUEMENT_SLOT + slot id
+	return getCustomAttribute(attributeSlot) != nullptr;
+}
+
 bool Item::getImbuementInfo(uint8_t slot, ImbuementInfo* imbuementInfo) const {
-	const CustomAttribute* attribute = getCustomAttribute(std::to_string(ITEM_IMBUEMENT_SLOT + slot));
+	std::string attributeSlot = std::to_string(ITEM_IMBUEMENT_SLOT + slot);
+	if (!hasImbuementAttribute(attributeSlot)) {
+		return false;
+	}
+
+	const CustomAttribute* attribute = getCustomAttribute(attributeSlot);
 	const auto info = attribute ? attribute->getAttribute<uint32_t>() : 0;
 	imbuementInfo->imbuement = g_imbuements().getImbuement(info & 0xFF);
 	imbuementInfo->duration = info >> 8;

diff --git a/src/items/item.hpp b/src/items/item.hpp
@@ -676,6 +676,7 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject {
 		return false;
 	}
 	bool hasImbuementCategoryId(uint16_t categoryId) const;
+	bool hasImbuementAttribute(const std::string &attributeSlot) const;
 	bool hasImbuements() const {
 		for (uint8_t slotid = 0; slotid < getImbuementSlot(); slotid++) {
 			ImbuementInfo imbuementInfo;