--- deliantra/server/socket/request.C	2007/03/14 04:12:29	1.75
+++ deliantra/server/socket/request.C	2007/03/14 13:05:30	1.76
@@ -461,6 +461,7 @@
 
           if (is_valid_faceset (q))
             ns->faceset = q;
+
           sprintf (tmpbuf, "%d", ns->faceset);
           safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
           /* if the client is using faceset, it knows about image2 command */
@@ -1271,6 +1272,8 @@
   max_x = pl->x + (socket.mapx + 1) / 2;
   max_y = pl->y + (socket.mapy + 1) / 2;
 
+  maptile *plmap = pl->map;
+
   for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
     {
       ax = 0;
@@ -1286,7 +1289,7 @@
            */
           nx = x;
           ny = y;
-          m = get_map_from_coord (pl->map, &nx, &ny);
+          m = get_map_from_coord (plmap, &nx, &ny);
 
           if (!m)
             {