--- deliantra/server/ext/login.ext	2007/09/19 21:56:30	1.72
+++ deliantra/server/ext/login.ext	2007/12/28 19:44:34	1.77
@@ -54,6 +54,12 @@
    1
 }
 
+sub safe_spot($$$) {
+   my ($m, $x, $y) = @_;
+
+   scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
+}
+
 sub enter_map {
    my ($pl) = @_;
 
@@ -66,47 +72,47 @@
 
    $ob->enter_link;
 
-   if (my $time = delete $pl->{unclean_save}) {
-      if (my $m = cf::map::find $map) {
-         if ($time < $m->{instantiate_time}) {
-            # the map was reset in the meantime
-            my $age = $cf::RUNTIME - $time;
-
-            warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
-
-            # for now, just go back to savebed
-            ($map, $x, $y) = $pl->savebed;
-
-            if ($age >= $MAX_DISCONNECT_TIME) {
-               $ob->message (
-                  "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
-                . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
-                . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
-                . "H<You disconnected too long without having used a savebed.>",
-                  cf::NDI_RED
-               );
-               # kill them.
-               # reminds me of the famous badness 10000 syndrome...
-               $ob->stats->hp (-10000); #] if they survive this they deserved to live
-               $pl->killer ("a cave-in");
-            } else {
-               $ob->message (
-                  "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
-                . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
-                . "Better use a savebed next time, much worse things could have happened... "
-                . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
-                  cf::NDI_RED
-               );
-            }
+   my $m = cf::map::find $map;
+   my $time = delete $pl->{unclean_save};
+
+   if ($time && $m && !safe_spot $m, $x, $y) {
+      if ($time < $m->{instantiate_time}) {
+         # the map was reset in the meantime
+         my $age = $cf::RUNTIME - $time;
+
+         warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
+
+         ($map, $x, $y) = $pl->savebed;
+
+         if ($age >= $MAX_DISCONNECT_TIME) {
+            $ob->message (
+               "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
+             . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
+             . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
+             . "H<You disconnected too long without having used a savebed.>",
+               cf::NDI_RED
+            );
+            # kill them.
+            # reminds me of the famous badness 10000 syndrome...
+            $ob->stats->hp (-10000); #] if they survive this they deserved to live
+            $pl->killer ("a cave-in");
          } else {
             $ob->message (
-               "You didn't use a bed to reality to leave this realm. This is very dangerous, "
-             . "as lots of things could happen when you leave by other means, such as cave-ins, "
-             . "or monsters suddenly snapping your body. Better use a savebed next time. "
-             . "H<Always apply a bed of reality to disconnect from the server.>",
+               "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
+             . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
+             . "Better use a savebed next time, much worse things could have happened... "
+             . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
                cf::NDI_RED
             );
          }
+      } else {
+         $ob->message (
+            "You didn't use a bed to reality to leave this realm. This is very dangerous, "
+          . "as lots of things could happen when you leave by other means, such as cave-ins, "
+          . "or monsters suddenly snapping your body. Better use a savebed next time. "
+          . "H<Always apply a bed of reality to disconnect from the server.>",
+            cf::NDI_RED
+         );
       }
    }
 
@@ -398,7 +404,7 @@
             Coro::Timer::sleep 0.2;
          }
 
-         $ob->reply (undef, "Welcome to Crossfire!");
+         $ob->reply (undef, "Welcome to Deliantra!");
 
          delete $pl->{deny_save};
 
@@ -494,10 +500,8 @@
 our $SCHEDULER = cf::async_ext {
    $Coro::current->{desc} = "player scheduler";
 
-   my $schedule_interval = Coro::Event->timer (after => 1);
    while () {
-      $schedule_interval->interval ($SCHEDULE_INTERVAL);
-      $schedule_interval->next;
+      Coro::EV::timer_once $SCHEDULE_INTERVAL;
 
       # this weird form of iteration over values is used because
       # the hash changes underneath us frequently, and for