--- deliantra/server/socket/init.C	2006/12/22 16:34:00	1.30
+++ deliantra/server/socket/init.C	2007/01/06 14:42:31	1.33
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2001 Mark Wedel
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -45,6 +46,8 @@
 #include <unistd.h>
 #include <arpa/inet.h>
 
+#include <algorithm>
+
 sockvec clients;
 
 /**
@@ -149,6 +152,10 @@
   send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
   flush ();
 
+  // clients are externally referenced by the socket
+  refcnt_inc ();
+  clients.push_back (this);
+
 #if 0//TODO
   socket_info.nconns++;
   if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns;
@@ -158,17 +165,9 @@
 
 client::~client ()
 {
-  if (pl)
-    {
-      pl->save ();
-      leave (pl, 1);
-      pl->ns = 0;
-
-      delete pl;
-    }
-
-  if (fd >= 0)
-    close (fd);
+  sockvec::iterator i = find (clients.begin (), clients.end (), this);
+  if (i != clients.end ())
+    clients.erase (i);
 
   sfree<uint8> (faces_sent, nrofpixmaps);
   free (stats.range);
@@ -177,14 +176,23 @@
 }
 
 void
-client::destroy ()
+client::do_destroy ()
 {
-  INVOKE_CLIENT (DESTROY, this);
+  attachable::do_destroy ();
+
+  if (pl)
+    pl->disconnect ();
+
+  if (fd >= 0)
+    close (fd);
 
   state = ST_DEAD;
 
   socket_ev.suspend ();
   cmd_ev.suspend ();
+
+  // socket now longer references us
+  refcnt_dec ();
 }
 
 /** This sets up the socket and reads all the image information into memory. */
@@ -225,7 +233,6 @@
   else
     {
       client *ns = new client (dup (fd), peername);
-      clients.push_back (ns);
 
       ns->instantiate (); // effectively a nop right now