--- deliantra/server/server/c_wiz.C	2006/12/21 06:12:37	1.24
+++ deliantra/server/server/c_wiz.C	2006/12/21 23:37:06	1.25
@@ -69,11 +69,13 @@
       new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
       return NULL;
     }
-  if (pl->state != ST_PLAYING)
+
+  if (pl->ns->state != ST_PLAYING)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
       return NULL;
     }
+
   return pl;
 }
 
@@ -218,11 +220,11 @@
    * Record this as a comment - then we don't have to worry about changing
    * the parsing code.
    */
-  fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket->host, &op->name, ctime (&now));
-  fprintf (banishfile, "*@%s\n", pl->socket->host);
+  fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
+  fprintf (banishfile, "*@%s\n", pl->ns->host);
   fclose (banishfile);
 
-  LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket->host);
+  LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
   new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
   new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
   command_kick (op, (char *) &pl->ob->name);
@@ -243,7 +245,7 @@
             strcpy (op->contr->killer, "kicked");
           }
 
-        pl->socket->destroy ();
+        pl->ns->destroy ();
       }
 
   return 1;
@@ -1387,7 +1389,7 @@
       return 0;
     }
 
-  if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket->host))
+  if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
     {
       SET_FLAG (op, FLAG_WIZ);
       SET_FLAG (op, FLAG_WAS_WIZ);