--- deliantra/server/ext/map-scheduler.ext	2007/01/23 01:05:17	1.25
+++ deliantra/server/ext/map-scheduler.ext	2007/01/23 01:17:08	1.26
@@ -56,8 +56,8 @@
             if ($map->should_reset) {
                $map->reset;
             } elsif ($map->in_memory == cf::MAP_IN_MEMORY) {
-               if ((cf::object::actives_size > $MAX_ACTIVES || $map->last_access + $SWAP_TIMEOUT <= $cf::RUNTIME)
-                   && !$map->players) {
+               my $max_idle = cf::object::actives_size > $MAX_ACTIVES ? 1 : $SWAP_TIMEOUT;
+               if ($map->last_access + $max_idle <= $cf::RUNTIME && !$map->players) {
                   $map->swap_out;
                   $cf::WAIT_FOR_TICK_ONE->wait;
                } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {