--- deliantra/server/common/object.C	2008/08/11 23:23:41	1.252
+++ deliantra/server/common/object.C	2008/08/17 22:46:26	1.253
@@ -764,6 +764,7 @@
       // this is likely overkill, TODO: revisit (schmorp)
       if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW)  && !(m.flags_ & P_BLOCKSVIEW))
           || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
+          || (op->type == PLAYER             && !(m.flags_ & P_PLAYER))
           || (op->type == SAFE_GROUND        && !(m.flags_ & P_SAFE))
           || (QUERY_FLAG (op, FLAG_ALIVE)    && !(m.flags_ & P_IS_ALIVE))
           || (QUERY_FLAG (op, FLAG_DAMNED)   && !(m.flags_ & P_NO_CLERIC))
@@ -1116,6 +1117,8 @@
       above = 0;
       below = 0;
 
+      ms.flags_ = 0;
+
       if (map->in_memory == MAP_SAVING)
         return;
 
@@ -1157,13 +1160,6 @@
           last = tmp;
         }
 
-      /* last == NULL if there are no objects on this space */
-      //TODO: this makes little sense, why only update the topmost object?
-      if (!last)
-        map->at (x, y).flags_ = 0;
-      else
-        update_object (last, UP_OBJ_REMOVE);
-
       if (flag [FLAG_BLOCKSVIEW] || glow_radius)
         update_all_los (map, x, y);
     }