--- deliantra/server/socket/item.C	2008/04/15 14:21:04	1.58
+++ deliantra/server/socket/item.C	2008/04/22 07:28:05	1.61
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -273,7 +273,7 @@
 
   sl << uint32 (head->count)
      << uint32 (flags)
-     << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
+     << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
      << uint32 (head->face);
 
   if (!head->custom_name)
@@ -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,12 +541,12 @@
 
   if (flags & UPD_WEIGHT)
     {
-      sint32 weight = WEIGHT (op);
+      sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
 
-      sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
-
-      if (pl == op)
+      if (op)
         ns->last_weight = weight;
+
+      sl << uint32 (weight);
     }
 
   if (flags & UPD_FACE)
@@ -637,7 +630,7 @@
   /* If this is not the player object, do some more checks */
   if (op != pl)
     {
-      /* We only send 'visibile' objects to the client */
+      /* We only send 'visible' objects to the client */
       if (!op->client_visible ())
         return;
 
@@ -667,8 +660,7 @@
 }
 
 /**
- * Tells the client to delete an item.  Uses the item
- * command with a -1 location.
+ * Tells the client to delete an item.
  */
 void
 esrv_del_item (player *pl, int tag)
@@ -925,22 +917,21 @@
        */
       if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
         {
-          object *current, *next;
-
           int cnt = MAX_ITEM_PER_DROP;
 
-          for (current = op->inv; current != NULL; current = next)
+          for (object *current = op->inv; current; )
             {
-              next = current->below;
+              object *next = current->below;
+
               drop_object (pl, current, 0);
 
               if (--cnt <= 0) break;
+
+              current = next;
             }
 
           if (cnt <= 0)
             op->failmsg ("Only dropped some items, can't drop that many items at once.");
-
-          esrv_update_item (UPD_WEIGHT, pl, op);
         }
       else
         drop_object (pl, op, nrof);