--- deliantra/server/socket/init.C	2006/12/21 06:12:37	1.27
+++ deliantra/server/socket/init.C	2006/12/22 06:02:29	1.29
@@ -120,6 +120,7 @@
     getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
   }
 
+  state = ST_SETUP;
   mapmode = Map0Cmd;
   darkness = 1;
   mapx = 11;
@@ -158,7 +159,7 @@
 client::~client ()
 {
   if (pl)
-    pl->socket = 0;
+    pl->ns = 0;
 
   if (fd >= 0)
     close (fd);
@@ -172,7 +173,9 @@
 void
 client::destroy ()
 {
-  destroyed = true;
+  INVOKE_CLIENT (DESTROY, this);
+
+  state = ST_DEAD;
 
   socket_ev.suspend ();
   cmd_ev.suspend ();