--- deliantra/server/common/treasure.C	2008/04/20 05:24:55	1.73
+++ deliantra/server/common/treasure.C	2008/07/29 02:00:55	1.79
@@ -34,7 +34,6 @@
 
 #include <global.h>
 #include <treasure.h>
-#include <funcpoint.h>
 #include <loader.h>
 
 extern char *spell_mapping[];
@@ -48,8 +47,7 @@
    treasurelist *,
    str_hash,
    str_equal,
-   slice_allocator< std::pair<const char *const, treasurelist *> >,
-   true
+   slice_allocator< std::pair<const char *const, treasurelist *> >
 > tl_map_t;
 
 static tl_map_t tl_map;
@@ -258,7 +256,7 @@
 
       op->expand_tail ();
 
-      if (op->blocked (creator->map, creator->x, creator->y))
+      if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y))
         op->destroy ();
       else
         {
@@ -272,10 +270,6 @@
 
       if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
         monster_check_apply (creator, op);
-
-      if (flags & GT_UPDATE_INV)
-        if (object *tmp = creator->in_player ())
-          esrv_send_item (tmp, op);
     }
 }
 
@@ -585,14 +579,17 @@
 
       if (magic < 0 && !(rndm (3)))        /* You can't just check the weight always */
         magic = (-magic);
+
       op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
     }
   else
     {
       if (op->type == ARMOUR)
         ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
+
       if (magic < 0 && !(rndm (3)))        /* You can't just check the weight always */
         magic = (-magic);
+
       op->weight = (op->weight * (100 - magic * 10)) / 100;
     }
 }