--- deliantra/server/common/object.C	2007/06/13 21:09:39	1.161
+++ deliantra/server/common/object.C	2007/06/16 00:12:20	1.162
@@ -939,18 +939,19 @@
     y = 1;
   }
 
-  head = 0;
-
   if (more)
     {
       more->destroy ();
       more = 0;
     }
 
-  // clear those pointers that likely might have circular references to us
-  owner       = 0;
-  enemy       = 0;
-  attacked_by = 0;
+  head = 0;
+
+  // clear those pointers that likely might cause circular references
+  owner          = 0;
+  enemy          = 0;
+  attacked_by    = 0;
+  current_weapon = 0;
 }
 
 void
@@ -2571,7 +2572,6 @@
     item = item->env;
 }
 
-
 const char *
 object::flag_desc (char *desc, int len) const
 {