--- deliantra/server/common/friend.C	2007/01/15 21:06:18	1.10
+++ deliantra/server/common/friend.C	2007/05/17 21:32:08	1.13
@@ -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) 2002 Mark Wedel & Crossfire Development Team
@@ -65,6 +65,12 @@
 
   CLEAR_FLAG (op, FLAG_FRIENDLY);
 
+  if (op->type == GOLEM
+      && op->owner
+      && op->owner->contr
+      && op->owner->contr->golem == op)
+    op->owner->contr->golem = 0;
+
   if (!first_friendly_object)
     {
       LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name);
@@ -88,6 +94,7 @@
         {
           if (obj->ob == op)
             break;
+
           prev = obj;
         }