--- deliantra/server/common/object.C	2007/04/21 17:34:22	1.139
+++ deliantra/server/common/object.C	2007/04/24 12:32:14	1.140
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
@@ -837,15 +837,7 @@
     remove_button_link (this);
 
   if (flag [FLAG_FRIENDLY])
-    {
-      remove_friendly_object (this);
-
-      if (type == GOLEM
-          && owner
-          && owner->type == PLAYER
-          && owner->contr->ranges[range_golem] == this)
-        owner->contr->ranges[range_golem] = 0;
-    }
+    remove_friendly_object (this);
 
   if (!flag [FLAG_REMOVED])
     remove ();