--- deliantra/Deliantra-Client/DC/Protocol.pm	2007/08/12 09:39:49	1.151
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2007/08/13 14:15:09	1.152
@@ -598,20 +598,27 @@
 
    my $gen = $self->{map_change_gen};
 
-   CFPlus::DB::get $self->{mapcache} => $hash, sub {
+   my $cb = sub {
       return unless $gen == $self->{map_change_gen};
 
       my ($data) = @_;
 
       if (defined $data) {
-         $data = Compress::LZF::decompress $data;
-         #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
+         $self->{map_cache_new}{$hash} = \$data;
+
+         my $data = Compress::LZF::decompress $data;
 
          my $inprogress = @{ $self->{bg_fetch} || [] };
          unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
          $self->bg_fetch unless $inprogress;
       }
    };
+
+   if (my $rdata = $self->{map_cache_old}{$hash}) {
+      $cb->($$rdata);
+   } else {
+      CFPlus::DB::get $self->{mapcache} => $hash, $cb;
+   }
 }
 
 # hardcode /world/world_xxx_xxx map names, the savings are enourmous,
@@ -714,6 +721,7 @@
    $self->flush_map;
 
    ++$self->{map_change_gen};
+   $self->{map_cache_old} = delete $self->{map_cache_new};
 
    my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);