--- deliantra/server/socket/item.C	2008/09/08 11:27:25	1.71
+++ deliantra/server/socket/item.C	2008/12/08 15:40:13	1.73
@@ -401,9 +401,9 @@
 
   if (flags & UPD_WEIGHT)
     {
-      sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
+      sint32 weight = op->client_weight ();
 
-      if (op)
+      if (op == pl)
         ns->last_weight = weight;
 
       sl << uint32 (weight);
@@ -735,7 +735,7 @@
         if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
           return;
 
-        if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
+        if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2] < LOS_MAX)
           return;
       }