--- deliantra/server/common/object.C	2008/07/15 20:41:58	1.249
+++ deliantra/server/common/object.C	2008/07/20 16:56:34	1.251
@@ -912,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 */
@@ -1540,10 +1537,9 @@
 
   nr = min (nr, nrof);
 
-  nrof -= nr;
-
-  if (nrof)
+  if (nrof > nr)
     {
+      nrof -= nr;
       adjust_weight (env, -weight * max (1, nr)); // carrying == 0
 
       if (object *pl = visible_to ())