--- deliantra/server/common/object.C	2007/02/07 02:13:06	1.129
+++ deliantra/server/common/object.C	2007/02/10 21:01:09	1.132
@@ -966,6 +966,12 @@
     {
       if (type == PLAYER)
         {
+          // leaving a spot always closes any open container on the ground
+          if (container && !container->env)
+            // this causes spurious floorbox updates, but it ensures
+            // that the CLOSE event is being sent.
+            close_container ();
+
           --map->players;
           map->touch ();
         }
@@ -2629,3 +2635,55 @@
   return name_to_material (unknown);
 }
 
+void
+object::open_container (object *new_container)
+{
+  if (container == new_container)
+    return;
+
+  if (object *old_container = container)
+    {
+      if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
+        return;
+
+#if 0
+      // remove the "Close old_container" object.
+      if (object *closer = old_container->inv)
+        if (closer->type == CLOSE_CON)
+          closer->destroy ();
+#endif
+
+      old_container->flag [FLAG_APPLIED] = 0;
+      container = 0;
+
+      esrv_update_item (UPD_FLAGS, this, old_container);
+      new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
+    }
+
+  if (new_container)
+    {
+      if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
+        return;
+
+      // TODO: this does not seem to serve any purpose anymore?
+#if 0
+      // insert the "Close Container" object.
+      if (archetype *closer = new_container->other_arch)
+        {
+          object *closer = arch_to_object (new_container->other_arch);
+          closer->flag [FLAG_NO_MAP_SAVE] = 1;
+          new_container->insert (closer);
+        }
+#endif
+
+      new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
+
+      new_container->flag [FLAG_APPLIED] = 1;
+      container = new_container;
+
+      esrv_update_item (UPD_FLAGS, this, new_container);
+      esrv_send_inventory (this, new_container);
+    }
+}
+
+