--- deliantra/server/common/object.C	2007/08/20 18:11:02	1.182
+++ deliantra/server/common/object.C	2007/08/20 19:13:10	1.183
@@ -431,22 +431,15 @@
 /*
  * Sets the owner and sets the skill and exp pointers to owner's current
  * skill and experience objects.
+ * ACTUALLY NO! investigate! TODO
  */
 void
 object::set_owner (object *owner)
 {
-  if (!owner)
-    return;
-
-  /* next line added to allow objects which own objects */
-  /* Add a check for ownercounts in here, as I got into an endless loop
-   * with the fireball owning a poison cloud which then owned the
-   * fireball.  I believe that was caused by one of the objects getting
-   * freed and then another object replacing it.  Since the ownercounts
-   * didn't match, this check is valid and I believe that cause is valid.
-   */
-  while (owner->owner)
-    owner = owner->owner;
+  // allow objects which own objects
+  if (owner)
+    while (owner->owner)
+      owner = owner->owner;
 
   this->owner = owner;
 }