fix: beds (#2611)

opentibiabr · May 9, 2024 · 94f178c · 94f178c
1 parent 10bc46b
commit 94f178c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/items/bed.cpp b/src/items/bed.cpp
@@ -94,12 +94,7 @@ bool BedItem::canUse(std::shared_ptr<Player> player) {
 		return false;
 	}
 
-	auto partName = itemType.name;
-	auto nextPartname = nextBedItem->getName();
-	auto firstPart = keepFirstWordOnly(partName);
-	auto nextPartOf = keepFirstWordOnly(nextPartname);
-	g_logger().debug("First bed part name {}, second part name {}", firstPart, nextPartOf);
-	if (!isMovable() || !nextBedItem->isMovable() || firstPart != nextPartOf) {
+	if (!isMovable() || !nextBedItem->isMovable() || !isBedComplete(nextBedItem)) {
 		return false;
 	}
 
@@ -122,6 +117,23 @@ bool BedItem::canUse(std::shared_ptr<Player> player) {
 	return true;
 }
 
+bool BedItem::isBedComplete(std::shared_ptr<BedItem> nextBedItem) {
+	const ItemType &it = Item::items[id];
+
+	if (nextBedItem == nullptr) {
+		return false;
+	}
+
+	auto partName = it.name;
+	auto nextPartname = nextBedItem->getName();
+	auto firstPart = keepFirstWordOnly(partName);
+	auto nextPartOf = keepFirstWordOnly(nextPartname);
+
+	g_logger().debug("First bed part id {} name {}, second part id {} name {}", it.id, firstPart, nextBedItem->getID(), nextPartOf);
+
+	return it.bedPartOf == nextBedItem->getID();
+}
+
 bool BedItem::trySleep(std::shared_ptr<Player> player) {
 	if (!house || player->isRemoved()) {
 		return false;

diff --git a/src/items/bed.hpp b/src/items/bed.hpp
@@ -39,6 +39,8 @@ class BedItem final : public Item {
 
 	bool canUse(std::shared_ptr<Player> player);
 
+	bool isBedComplete(std::shared_ptr<BedItem> nextBedItem);
+
 	bool trySleep(std::shared_ptr<Player> player);
 	bool sleep(std::shared_ptr<Player> player);
 	void wakeUp(std::shared_ptr<Player> player);