--- deliantra/server/socket/item.C	2008/04/22 07:01:47	1.60
+++ deliantra/server/socket/item.C	2008/04/23 07:49:57	1.62
@@ -508,15 +508,8 @@
 esrv_update_item (int flags, object *pl, object *op)
 {
   /* If we have a request to send the player item, skip a few checks. */
-  if (op != pl)
-    {
-      if (!op->client_visible ())
-        return;
-      /* we remove the check for op->env, because in theory, the object
-       * is hopefully in the same place, so the client should preserve
-       * order.
-       */
-    }
+  if (op != pl && !op->client_visible ())
+    return;
 
   client *ns = pl->contr->ns;
   if (!ns)
@@ -548,14 +541,12 @@
 
   if (flags & UPD_WEIGHT)
     {
-      sint32 weight = op->client_weight ();
+      sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
 
-      sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
-
-#if 0
-      if (pl == op)
+      if (op)
         ns->last_weight = weight;
-#endif
+
+      sl << uint32 (weight);
     }
 
   if (flags & UPD_FACE)
@@ -945,8 +936,6 @@
       else
         drop_object (pl, op, nrof);
 
-      update_after_inventory_change (pl);
-
       return;
     }
   else if (to == pl->count)
@@ -972,10 +961,9 @@
    * in a sack, so check for those things.  We should also check
    * an make sure env is in fact a container for that matter.
    */
-  if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
-    {
-      put_object_in_sack (pl, env, op, nrof);
-      update_after_inventory_change (pl);
-    }
+  if (env->type == CONTAINER
+      && can_pick (pl, op)
+      && sack_can_hold (pl, env, op, nrof))
+    put_object_in_sack (pl, env, op, nrof);
 }