--- deliantra/server/ext/map-scheduler.ext	2007/01/01 17:50:26	1.6
+++ deliantra/server/ext/map-scheduler.ext	2007/01/03 03:04:12	1.8
@@ -3,17 +3,21 @@
 # this extension swaps out maps and resets them, in essence managing
 # the reset/swap policy of the server.
 
-our $DEACTIVATE_TIMEOUT =   60; # number of seconds after which maps get deactivated to save cpu
-our $SWAP_TIMEOUT       =   70; # number of seconds after which maps inactive get swapped out
-our $SCHEDULE_INTERVAL  =    5; # time the map scheduler sleeps between runs
-our $SAVE_TIMEOUT       =   40; # save maps every n seconds
-our $SAVE_INTERVAL      =  0.4; # save at max. one map every $SAVE_INTERVAL
+our $DEACTIVATE_TIMEOUT =   20; # number of seconds after which maps get deactivated to save cpu
+our $SWAP_TIMEOUT       =   50; # number of seconds after which maps inactive get swapped out
+our $SCHEDULE_INTERVAL  =    2; # time the map scheduler sleeps between runs
+our $SAVE_TIMEOUT       =   30; # save maps every n seconds
+our $SAVE_INTERVAL      =  0.3; # save at max. one map every $SAVE_INTERVAL
 
 our $SCHEDULER = cf::coro {
    while () {
       Coro::Timer::sleep $SCHEDULE_INTERVAL;
 
-      for my $map (values %cf::MAP) {
+      my @maps = keys %cf::MAP;
+      for (@maps) {
+         my $map = $cf::MAP{$_}
+            or next;
+         $map->valid or next;
          eval {
             # not yet, because maps might become visible to players nearby
             # we need to remove the map from %cf::MAP and all tiled map links
@@ -35,7 +39,7 @@
          };
          warn $@ if $@;
          Coro::cede;
-      }
+      };
    }
 };