--- deliantra/server/common/object.C	2007/10/17 22:01:27	1.196
+++ deliantra/server/common/object.C	2007/11/08 19:43:23	1.199
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
@@ -450,6 +450,12 @@
     while (owner->owner)
       owner = owner->owner;
 
+  if (flag [FLAG_FREED])
+    {
+      LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
+      return;
+    }
+
   this->owner = owner;
 }
 
@@ -1954,12 +1960,11 @@
 void
 flag_inv (object *op, int flag)
 {
-  if (op->inv)
-    for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
-      {
-        SET_FLAG (tmp, flag);
-        flag_inv (tmp, flag);
-      }
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
+    {
+      SET_FLAG (tmp, flag);
+      flag_inv (tmp, flag);
+    }
 }
 
 /*
@@ -1968,12 +1973,11 @@
 void
 unflag_inv (object *op, int flag)
 {
-  if (op->inv)
-    for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
-      {
-        CLEAR_FLAG (tmp, flag);
-        unflag_inv (tmp, flag);
-      }
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
+    {
+      CLEAR_FLAG (tmp, flag);
+      unflag_inv (tmp, flag);
+    }
 }
 
 /*