ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.312 by root, Sat Jul 21 18:01:26 2007 UTC vs.
Revision 1.313 by root, Sun Jul 22 14:17:58 2007 UTC

2450sub cf::client::send_msg { 2450sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2451 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2452
2453 $msg = $self->pl->expand_cfpod ($msg); 2453 $msg = $self->pl->expand_cfpod ($msg);
2454 2454
2455 return unless @extra || length $msg;
2456
2457 $color &= ~cf::NDI_UNIQUE; # just in case... 2455 $color &= ~cf::NDI_UNIQUE; # just in case...
2458 2456
2459 if (ref $channel) { 2457 if (ref $channel) {
2460 # send meta info to client, if not yet sent 2458 # send meta info to client, if not yet sent
2461 unless (exists $self->{channel}{$channel->{id}}) { 2459 unless (exists $self->{channel}{$channel->{id}}) {
2463 $self->ext_event (channel_info => %$channel); 2461 $self->ext_event (channel_info => %$channel);
2464 } 2462 }
2465 2463
2466 $channel = $channel->{id}; 2464 $channel = $channel->{id};
2467 } 2465 }
2466
2467 return unless @extra || length $msg;
2468 2468
2469 if ($self->can_msg) { 2469 if ($self->can_msg) {
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2471 } else { 2471 } else {
2472 # replace some tags by gcfclient-compatible ones 2472 # replace some tags by gcfclient-compatible ones

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines