fix: items with only attack bug

opentibiabr · Sep 24, 2024 · cd534af · cd534af
1 parent 8d8c450
commit cd534af
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/items/item.cpp b/src/items/item.cpp
@@ -1187,8 +1187,10 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr<Item> item /*= nullptr
 				attackDescription = fmt::format("{} {}", it.abilities->elementDamage, getCombatName(it.abilities->elementType));
 			}
 
-			if (it.attack != 0) {
+			if (attack != 0 && !attackDescription.empty()) {
 				attackDescription = fmt::format("{} physical + {}", attack, attackDescription);
+			} else if (attack != 0 && attackDescription.empty()) {
+				attackDescription = std::to_string(attack);
 			}
 
 			if (!attackDescription.empty()) {
@@ -1605,8 +1607,10 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr<Item> item /*= nullptr
 				attackDescription = fmt::format("{} {}", it.abilities->elementDamage, getCombatName(it.abilities->elementType));
 			}
 
-			if (it.attack != 0) {
+			if (attack != 0 && !attackDescription.empty()) {
 				attackDescription = fmt::format("{} physical + {}", attack, attackDescription);
+			} else if (attack != 0 && attackDescription.empty()) {
+				attackDescription = std::to_string(attack);
 			}
 
 			if (!attackDescription.empty()) {

diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp
@@ -5746,13 +5746,13 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) {
 			attackDescription = fmt::format("{} {}", it.abilities->elementDamage, getCombatName(it.abilities->elementType));
 		}
 
-		if (it.attack != 0) {
+		if (it.attack != 0 && !attackDescription.empty()) {
 			attackDescription = fmt::format("{} physical + {}", it.attack, attackDescription);
+		} else if (it.attack != 0 && attackDescription.empty()) {
+			attackDescription = std::to_string(it.attack);
 		}
 
-		if (!attackDescription.empty()) {
-			msg.addString(attackDescription, "ProtocolGame::sendMarketDetail - attackDescription");
-		}
+		msg.addString(attackDescription, "ProtocolGame::sendMarketDetail - attackDescription");
 	} else {
 		msg.add<uint16_t>(0x00);
 	}