--- deliantra/server/common/player.C	2007/02/16 19:43:41	1.21
+++ deliantra/server/common/player.C	2007/04/30 04:25:29	1.24
@@ -79,7 +79,6 @@
   PL_OUT  (gen_sp);
   PL_OUT  (gen_grace);
   PL_OUT  (listening);
-  PL_OUT  (shoottype);
   PL_OUT  (bowtype);
   PL_OUT  (petmode);
   PL_OUT  (peaceful);
@@ -186,7 +185,6 @@
           case KW_oid:           f.get (pl, f.get_sint32 ()); break;
           case KW_password:      assign (pl->password , f.get_str ()); break;
           case KW_title:         assign (pl->own_title, f.get_str ()); break;
-          case KW_shoottype:     pl->shoottype = (rangetype) f.get_sint32 (); break;
           case KW_bowtype:       pl->bowtype   = (bowtype_t) f.get_sint32 (); break;
           case KW_petmode:       pl->petmode   = (petmode_t) f.get_sint32 (); break;
           case KW_listening:     f.get (pl->listening); break;
@@ -255,7 +253,9 @@
 failure:
   LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
 
-  pl->ob->destroy ();
+  if (pl->ob)
+    pl->ob->destroy ();
+
   pl->destroy ();
 
   return 0;