--- deliantra/server/ext/chat.ext	2007/08/10 05:38:16	1.30
+++ deliantra/server/ext/chat.ext	2007/09/19 21:56:30	1.33
@@ -64,6 +64,7 @@
       my ($pl) = @_;
 
       clean_timeouts $pl->ob;
+
       $pl->send_msg ($SAY_CHANNEL);
       $pl->send_msg ($CHAT_CHANNEL);
    },
@@ -708,6 +709,7 @@
       
       cf::async {
          my $name = $ob->name;
+         $Coro::current->{desc} = "emote handler for $name";
          
          if ($tname eq $name) {
             my %emote = %{ $emotes->{$emotion}->{self} || {} };
@@ -778,7 +780,7 @@
       my $name = $ob->name;
       my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
 
-      $_->send_msg ($SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | ($_ == $ob ? cf::NDI_REPLY : 0))
+      $_->send_msg ($SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | ($_ == $ob->contr ? cf::NDI_REPLY : 0))
          for @plonmap;
 
       # npcs, magic_ears etc.