--- deliantra/server/lib/cf.pm	2007/08/25 16:51:38	1.341
+++ deliantra/server/lib/cf.pm	2007/08/27 01:13:48	1.343
@@ -1950,7 +1950,7 @@
    my ($map) = @_;
 
    cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
-      if $Coro::current != $Coro::main;
+      if $Coro::current == $Coro::main;
 
    cf::sync_job { $map->load };
 }
@@ -2560,11 +2560,9 @@
 sub cf::client::ext_msg($$@) {
    my ($self, $type, @msg) = @_;
 
-   my $extcmd = $self->extcmd;
-
-   if ($extcmd == 2) {
+   if ($self->extcmd == 2) {
       $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
-   } elsif ($extcmd == 1) { # TODO: remove
+   } elsif ($self->extcmd == 1) { # TODO: remove
       push @msg, msgtype => "event_$type";
       $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
    }
@@ -2581,7 +2579,7 @@
 
    if ($self->extcmd == 2) {
       $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
-   } elsif ($self->ns->extcmd == 1) {
+   } elsif ($self->extcmd == 1) {
       #TODO: version 1, remove
       unshift @msg, msgtype => "reply", msgid => $id;
       $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));