--- deliantra/server/socket/loop.C	2006/12/27 15:04:39	1.34
+++ deliantra/server/socket/loop.C	2007/01/08 18:18:36	1.37
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -137,23 +138,26 @@
 #endif
 
   //TODO: should not be done here, either
-  for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
+  for (int i = 0; i < clients.size (); ++i)
     {
-      client *s = *i;
+      client *s = clients [i];
+      player *pl = s->pl;
 
-      if (player *pl = s->pl)
+      if (pl && pl->ns && !pl->ns->destroyed ())
         {
+          client *ns = pl->ns;
+
           /* Update the players stats once per tick.  More efficient than
            * sending them whenever they change, and probably just as useful
            */
           esrv_update_stats (pl);
 
-          if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
+          if (ns->last_weight != -1 && ns->last_weight != WEIGHT (pl->ob))
             {
               esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
-              if (pl->last_weight != WEIGHT (pl->ob))
+              if (ns->last_weight != WEIGHT (pl->ob))
                 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
-                     (unsigned long) pl->last_weight, WEIGHT (pl->ob));
+                     (unsigned long) ns->last_weight, WEIGHT (pl->ob));
             }
 
           draw_client_map (pl->ob);