--- deliantra/server/common/living.C	2007/01/04 16:19:31	1.24
+++ deliantra/server/common/living.C	2007/01/08 18:18:35	1.26
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -1680,11 +1681,14 @@
   skill_obj->stats.exp = 0;
   skill_obj->level = 1;
   insert_ob_in_ob (skill_obj, op);
+
   if (op->contr)
     {
-      op->contr->last_skill_ob[skill_obj->subtype] = skill_obj;
-      op->contr->last_skill_exp[skill_obj->subtype] = -1;
+      op->contr->last_skill_ob [skill_obj->subtype] = skill_obj;
+      if (op->contr->ns)
+        op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
     }
+
   return skill_obj;
 }