--- deliantra/server/common/object.C	2007/01/23 03:17:55	1.121
+++ deliantra/server/common/object.C	2007/01/26 20:59:56	1.123
@@ -777,6 +777,7 @@
   if (!drop_to_ground
       || !map
       || map->in_memory != MAP_IN_MEMORY
+      || map->nodrop
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
@@ -902,7 +903,6 @@
  *   object will have no environment.  If the object previously had an
  *   environment, the x and y coordinates will be updated to
  *   the previous environment.
- *   Beware: This function is called from the editor as well!
  */
 void
 object::remove_slow ()