--- deliantra/server/common/object.C	2007/10/17 19:08:12	1.195
+++ deliantra/server/common/object.C	2007/10/17 22:01:27	1.196
@@ -1985,10 +1985,7 @@
  * start and stop are where to start relative to the free_arr array (1,9
  * does all 4 immediate directions).  This returns the index into the
  * array of the free spot, -1 if no spot available (dir 0 = x,y)
- * Note - this only checks to see if there is space for the head of the
- * object - if it is a multispace object, this should be called for all
- * pieces.
- * Note2: This function does correctly handle tiled maps, but does not
+ * Note: This function does correctly handle tiled maps, but does not
  * inform the caller.  However, insert_ob_in_map will update as
  * necessary, so the caller shouldn't need to do any special work.
  * Note - updated to take an object instead of archetype - this is necessary
@@ -2045,6 +2042,9 @@
       if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
         continue;
 
+      if (ob->blocked (m, pos.x, pos.y))
+        continue;
+
       altern [index++] = i;
     }