--- deliantra/server/lib/cf.pm	2007/04/04 02:07:19	1.232
+++ deliantra/server/lib/cf.pm	2007/04/05 13:44:31	1.234
@@ -965,7 +965,7 @@
 sub path($) {
    my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
 
-   (playerdir $login) . "/$login.pl"
+   (playerdir $login) . "/playerdata"
 }
 
 sub find_active($) {
@@ -988,6 +988,13 @@
       my $guard = cf::lock_acquire "user_find:$login";
 
       $cf::PLAYER{$_[0]} || do {
+         # rename old playerfiles to new ones
+         #TODO: remove when no longer required
+         aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
+         aio_link +(playerdir $login) . "/$login.pl"    , (playerdir $login) . "/playerdata";
+         aio_unlink +(playerdir $login) . "/$login.pl.pst";
+         aio_unlink +(playerdir $login) . "/$login.pl";
+
          my $pl = load_pl path $login
             or return;
          $cf::PLAYER{$login} = $pl
@@ -1967,6 +1974,8 @@
 
    if ($exit->slaying eq "/!") {
       #TODO: this should de-fi-ni-te-ly not be a sync-job
+      # the problem is that $exit might not survive long enough
+      # so it needs to be done right now, right here
       cf::sync_job { prepare_random_map $exit };
    }
 
@@ -1984,9 +1993,9 @@
          1;
       }) {
          $self->message ("Something went wrong deep within the crossfire server. "
-                     . "I'll try to bring you back to the map you were before. "
-                     . "Please report this to the dungeon master!",
-                       cf::NDI_UNIQUE | cf::NDI_RED);
+                       . "I'll try to bring you back to the map you were before. "
+                       . "Please report this to the dungeon master!",
+                         cf::NDI_UNIQUE | cf::NDI_RED);
 
          warn "ERROR in enter_exit: $@";
          $self->leave_link;