--- deliantra/server/ext/rent.ext	2006/12/21 22:41:34	1.2
+++ deliantra/server/ext/rent.ext	2007/01/04 18:38:22	1.3
@@ -32,11 +32,10 @@
 
    cf::override;
 
-   teleport $pl, "/world/world_105_115", 2, 34
+   $pl->goto_map ("/world/world_105_115", 2, 34)
       unless
          $pl->ob->map
-         && $pl->ob->map->path !~ /nimbus/
-         && $pl->ob->map->path !~ m%/var/crossfire/players/%;
+         && !$pl->ob->map->{path}{user_rel};
 }
 
 sub update_balance {
@@ -203,7 +202,7 @@
    },
 ;
 
-Event->timer (after => 60, interval => 3600, data => cf::WF_AUTOCANCEL, cb => sub {
+our $RENT_TIMER = Event->timer (after => 60, interval => 3600, data => cf::WF_AUTOCANCEL, cb => sub {
    pay_balance $_ for cf::player::list;
 });