Fix furniture being placeable on flowers

heimskr · May 9, 2023 · 25e1a47 · 25e1a47
1 parent 5e187c0
commit 25e1a47
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/item/Furniture.cpp b/src/item/Furniture.cpp
@@ -11,10 +11,12 @@ namespace Game3 {
 		auto &realm = *place.realm;
 		Game &game = realm.getGame();
 		const auto &position = place.position;
-
 		const auto &details = GhostDetails::get(game, stack);
 
-		if ((details.layer == 3 || place.isPathable()) && !realm.hasTileEntityAt(position) && nullptr != realm.add(TileEntity::create<Ghost>(game, place, stack.withCount(1)))) {
+		if (auto id = place.get(details.layer); !id || *id != realm.getTileset().getEmptyID())
+			return false;
+
+		if (!realm.hasTileEntityAt(position) && nullptr != realm.add(TileEntity::create<Ghost>(game, place, stack.withCount(1)))) {
 			if (--stack.count == 0)
 				place.player->inventory->erase(slot);
 			place.player->inventory->notifyOwner();