--- deliantra/server/lib/cf.pm	2007/05/19 00:08:11	1.267
+++ deliantra/server/lib/cf.pm	2007/05/22 10:50:00	1.268
@@ -1977,22 +1977,44 @@
    },
 );
 
-=item $player_object->goto ($path, $x, $y)
+=item $player_object->goto ($path, $x, $y[, $check->($map)])
+
+Moves the player to the given map-path and coordinates by first freezing
+her, loading and preparing them map, calling the provided $check callback
+that has to return the map if sucecssful, and then unfreezes the player on
+the new (success) or old (failed) map position.
 
 =cut
 
 sub cf::object::player::goto {
-   my ($self, $path, $x, $y) = @_;
+   my ($self, $path, $x, $y, $check) = @_;
+
+   #d# #TODO#
+   if ($check && !ref $check) {
+      warn Carp::longmess "goto called with non-ref check argument";#d#
+      undef $check;
+   }
 
    $self->enter_link;
 
    (async {
       my $map = eval {
          my $map = cf::map::find $path;
-         $map = $map->customise_for ($self) if $map;
+
+         if ($map) {
+            $map = $map->customise_for ($self);
+            $map = $check->($map) if $check && $map;
+         } else {
+            $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
+         }
+
          $map
-      } or
-         $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
+      };
+
+      if ($@) {
+         $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
+         LOG llevError | logBacktrace, Carp::longmess $@;
+      }
 
       $self->leave_link ($map, $x, $y);
    })->prio (1);
@@ -2850,6 +2872,8 @@
    $signal->wait;
 }
 
+      my $min = 1e6;#d#
+      my $avg = 10;
 $TICK_WATCHER = Event->timer (
    reentrant => 0,
    parked    => 1,
@@ -2867,6 +2891,29 @@
 
       cf::server_tick; # one server iteration
 
+      0 && sync_job {#d#
+         for(1..10)  {
+            my $t = Event::time;
+            my $map = my $map = new_from_path cf::map "/tmp/x.map"
+                     or die;
+
+            $map->width (50);
+            $map->height (50);
+            $map->alloc;
+            $map->_load_objects ("/tmp/x.map", 1);
+            my $t = Event::time - $t;
+
+            #next unless $t < 0.0013;#d#
+            if ($t < $min) {
+               $min = $t;
+            }
+            $avg = $avg * 0.99 + $t * 0.01;
+         }
+         warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
+         exit 0;
+         # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
+      };
+
       $RUNTIME   += $TICK;
       $NEXT_TICK += $TICK;