--- deliantra/server/ext/town_portal.ext	2007/05/22 21:35:26	1.2
+++ deliantra/server/ext/town_portal.ext	2008/06/15 20:32:50	1.5
@@ -45,7 +45,7 @@
    on_apply => sub {
       my ($self, $who) = @_;
 
-      $who->{town_portal} = [$who->map, $who->x, $who->y, $self->uuid];
+      $who->{town_portal} = [$who->map->as_string, $who->x, $who->y, $self->uuid];
    },
 ;
 
@@ -59,6 +59,8 @@
          $who->goto ($map, $x, $y, sub {
             my ($map) = @_;
 
+            $map->load; # make sure the map is loaded
+
             if (grep $_->uuid eq $uuid, $map->at ($x, $y)) {
                $who->reply (undef, "The town portal weaves its magic... and after a short moment, you return to the magic portal.", cf::NDI_NAVY);
 
@@ -80,3 +82,4 @@
       cf::override 1;
    },
 ;
+