--- deliantra/server/common/object.C	2008/07/14 18:36:43	1.247
+++ deliantra/server/common/object.C	2008/07/16 14:29:40	1.250
@@ -347,7 +347,8 @@
           // maybe there is a player standing on the same mapspace
           // this will catch the case where "this" is a player
           if (object *pl = ms ().player ())
-            if (!pl->container || this == pl->container)
+            if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
+                || this == pl->container)
               return pl;
         }
     }
@@ -911,10 +912,7 @@
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
-        {
-          inv->destroy_inv (false);
-          inv->destroy ();
-        }
+        inv->destroy (true);
     }
   else
     {                       /* Put objects in inventory onto this space */
@@ -1552,7 +1550,7 @@
     }
   else
     {
-      destroy (1);
+      destroy ();
       return false;
     }
 }