--- deliantra/server/ext/cfplus.ext	2006/12/15 19:29:18	1.1
+++ deliantra/server/ext/cfplus.ext	2006/12/21 22:41:34	1.3
@@ -68,6 +68,8 @@
    my ($pl, $msg) = @_;
    my ($dx, $dy) = @$msg{qw(dx dy)};
 
+   return unless $pl->ob && $pl->ob->map;
+
    my $near = (abs $dx) <= 2 && (abs $dy) <= 2;
 
    my %res;
@@ -98,6 +100,7 @@
    my ($pl, $msg) = @_;
    my ($id, $dx, $dy) = @$msg{qw(msgid dx dy)};
 
+   return unless $pl->ob && $pl->ob->map;
    return unless (abs $dx) <= 2 && (abs $dy) <= 2;
    return unless $pl->cell_visible ($dx, $dy);
 
@@ -148,13 +151,13 @@
    ()
 };
 
-cf::attach_to_players
+cf::player->attach (
    on_logout => sub {
       my ($pl) = @_;
 
       delete $dialog{$_} for grep $pl->ob == $dialog{$_}{ob}, keys %dialog;
    },
-;
+);
 
 =item ... = extcmd editor_support