DFHack · myk002 · May 31, 2024 · May 30, 2024 · May 30, 2024 · May 31, 2024
diff --git a/docs/about/Removed.rst b/docs/about/Removed.rst
@@ -173,12 +173,30 @@ fix/feeding-timers
 ==================
 The corresponding DF :bug:`2606` was fixed in DF 0.40.12.
 
+.. _fix/item-occupancy:
+
+fix/item-occupancy
+==================
+Merged into `fix/occupancy`.
+
 .. _fix/merchants:
 
 fix/merchants
 =============
 Humans can now make trade agreements. This fix is no longer necessary.
 
+.. _fix/tile-occupancy:
+
+fix/tile-occupancy
+==================
+Merged into `fix/occupancy`.
+
+.. _fix-unit-occupancy:
+
+fix-unit-occupancy
+==================
+Merged into `fix/occupancy`.
+
 .. _fortplan:
 
 fortplan

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -62,6 +62,7 @@ Template for new versions:
 - `seedwatch`: display a limit of ``-`` instead of ``0`` for a seed that is present in inventory but not being watched
 - `tiletypes`: make aquifers functional when adding the ``aquifer`` property
 - `seedwatch`: do not include unplantable tree seeds in its status report
+- ``Buildings::containsTile``: fix result for buildings that are solid and have no extent structures
 
 ## Misc Improvements
 - `blueprint`: capture track carving designations in addition to already-carved tracks

diff --git a/docs/plugins/fix-occupancy.rst b/docs/plugins/fix-occupancy.rst
@@ -0,0 +1,9 @@
+fix-occupancy
+=============
+
+.. dfhack-tool::
+    :summary: Provides the backend logic for fix/occupancy.
+    :tags: dev
+    :no-command:
+
+This plugin provides the backend logic for `fix/occupancy`.
diff --git a/docs/plugins/fix-unit-occupancy.rst b/docs/plugins/fix-unit-occupancy.rst
diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
@@ -895,6 +895,9 @@ bool Buildings::containsTile(df::building *bld, df::coord2d tile) {
             return false;
     }
 
+    if (!bld->room.extents)
+        return true;
+
     df::building_extents_type *etile = getExtentTile(bld->room, tile);
     return etile && *etile;
 }

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -117,7 +117,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(fastdwarf fastdwarf.cpp)
     dfhack_plugin(faststart faststart.cpp)
     dfhack_plugin(filltraffic filltraffic.cpp)
-    #dfhack_plugin(fix-unit-occupancy fix-unit-occupancy.cpp)
+    dfhack_plugin(fix-occupancy fix-occupancy.cpp LINK_LIBRARIES lua)
     #dfhack_plugin(fixveins fixveins.cpp)
     dfhack_plugin(flows flows.cpp)
     #dfhack_plugin(follow follow.cpp)