--- deliantra/server/common/object.C	2008/07/15 20:41:58	1.249
+++ deliantra/server/common/object.C	2008/08/11 23:23:41	1.252
@@ -764,7 +764,6 @@
       // this is likely overkill, TODO: revisit (schmorp)
       if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW)  && !(m.flags_ & P_BLOCKSVIEW))
           || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
-          || (op->type == PLAYER             && !(m.flags_ & P_PLAYER))
           || (op->type == SAFE_GROUND        && !(m.flags_ & P_SAFE))
           || (QUERY_FLAG (op, FLAG_ALIVE)    && !(m.flags_ & P_IS_ALIVE))
           || (QUERY_FLAG (op, FLAG_DAMNED)   && !(m.flags_ & P_NO_CLERIC))
@@ -772,7 +771,7 @@
           || (m.move_off  | op->move_off ) != m.move_off
           || (m.move_slow | op->move_slow) != m.move_slow
           /* This isn't perfect, but I don't expect a lot of objects to
-           * to have move_allow right now.    
+           * have move_allow right now.    
            */
           || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
           || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
@@ -912,10 +911,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 +1536,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 ())