--- deliantra/server/common/button.C	2007/01/29 15:36:25	1.28
+++ deliantra/server/common/button.C	2007/04/24 12:32:14	1.29
@@ -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
@@ -736,16 +736,19 @@
 
         if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
           {
-            remove_friendly_object (tmp);
-
             tmp->attack_movement = 0;
             /* lots of checks here, but want to make sure we don't
              * dereference a null value
              */
-            if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp)
+            if (tmp->type == GOLEM
+                && tmp->owner
+                && tmp->owner->type == PLAYER
+                && tmp->owner->contr->ranges[range_golem] == tmp)
               tmp->owner->contr->ranges[range_golem] = 0;
 
             tmp->owner = 0;
+
+            remove_friendly_object (tmp);
           }
         break;