--- deliantra/server/ext/chat.ext	2007/07/23 21:53:21	1.26
+++ deliantra/server/ext/chat.ext	2007/07/24 22:49:40	1.28
@@ -833,14 +833,16 @@
 };
 
 cf::register_command chat => sub {
-   my ($pl, $msg) = @_;
+   my ($ob, $msg) = @_;
 
    utf8::decode $msg;
 
-   return if $pl->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg);
+   my $pl = $ob->contr;
+
+   return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg);
 
    if ($msg) {
-      my $name = $pl->name;
+      my $name = $ob->name;
       my $NOW = time;
 
       cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
@@ -855,15 +857,17 @@
 };
 
 cf::register_command shout => sub {
-   my ($pl, $msg) = @_;
+   my ($ob, $msg) = @_;
 
    utf8::decode $msg;
 
-   return if $pl->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
+   my $pl = $ob->contr;
+
+   return if $pl->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
 
    if ($msg) {
       my $NOW = time;
-      my $name = $pl->name;
+      my $name = $ob->name;
 
       cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
       send_irc ("\007\0034{%s} %s\n", $name, $msg);