--- deliantra/server/common/object.C	2008/05/04 08:25:32	1.230
+++ deliantra/server/common/object.C	2008/05/06 18:09:42	1.232
@@ -1292,7 +1292,7 @@
    */
   if (!xy_normalise (m, op->x, op->y))
     {
-      op->destroy (1);
+      op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
       return 0;
     }
 
@@ -1820,7 +1820,7 @@
     }
 
   for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
-    if (tmp->arch == at)
+    if (tmp->arch->archname == at->archname)
       return tmp;
 
   return NULL;
@@ -1894,8 +1894,8 @@
 object *
 present_arch_in_ob (const archetype *at, const object *op)
 {
-  for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
-    if (tmp->arch == at)
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
+    if (tmp->arch->archname == at->archname)
       return tmp;
 
   return NULL;