--- deliantra/server/ext/login.ext	2007/07/10 06:12:13	1.61
+++ deliantra/server/ext/login.ext	2007/07/14 14:33:29	1.62
@@ -55,19 +55,21 @@
 sub enter_map {
    my ($pl) = @_;
 
+   my $ob = $pl->ob;
+
    my ($map, $x, $y)
-      = $pl->ob->{_link_pos}
-        ? @{delete $pl->ob->{_link_pos}}
-        : ($pl->maplevel, $pl->ob->x, $pl->ob->y);
+      = $ob->{_link_pos}
+        ? @{delete $ob->{_link_pos}}
+        : ($pl->maplevel, $ob->x, $ob->y);
 
-   $pl->ob->enter_link;
+   $ob->enter_link;
 
    if (my $time = delete $pl->{unclean_save}) {
       if (my $m = cf::map::find $map) {
-         if ($time < $m->{instantiate_time}) {
+         if ($time < $m->{instantiate_time} || 1) {#d#
             # the map was reset in the meantime
             my $age = $cf::RUNTIME - $time;
-            warn $pl->ob->name, " map reset after logout, logout age $age\n";#d#
+            warn $ob->name, " map reset after logout, logout age $age\n";#d#
 
             # for now, just go back to savebed
             ($map, $x, $y) = $pl->savebed;
@@ -89,7 +91,7 @@
       }
    }
 
-   $pl->ob->goto ($map, $x, $y);
+   $ob->goto ($map, $x, $y);
 }
 
 # delete a player directory, be non-blocking AND synchronous...