--- deliantra/server/socket/item.C	2008/04/22 07:01:47	1.60
+++ deliantra/server/socket/item.C	2008/04/22 07:28:05	1.61
@@ -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 ();
-
-      sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
+      sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
 
-#if 0
-      if (pl == op)
+      if (op)
         ns->last_weight = weight;
-#endif
+
+      sl << uint32 (weight);
     }
 
   if (flags & UPD_FACE)