fix: fluid clamp (#1698)

Previous PR did some math on fluids that didn't work when dropping splashes, this fixes it to be more deterministic.
opentibiabr · Oct 13, 2023 · 5c4b79d · 5c4b79d
1 parent a9198d2
commit 5c4b79d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/items/item.cpp b/src/items/item.cpp
@@ -185,7 +185,8 @@ Item::Item(const uint16_t itemId, uint16_t itemCount /*= 0*/) :
 	const ItemType &it = items[id];
 	auto itemCharges = it.charges;
 	if (it.isFluidContainer() || it.isSplash()) {
-		setAttribute(ItemAttribute_t::FLUIDTYPE, itemCount * (itemCount < sizeof(Fluids_t)));
+		auto fluidType = std::clamp<uint16_t>(itemCount, 1, FLUID_INK);
+		setAttribute(ItemAttribute_t::FLUIDTYPE, fluidType);
 	} else if (it.stackable) {
 		if (itemCount != 0) {
 			setItemCount(static_cast<uint8_t>(itemCount));