--- deliantra/server/lib/cf.pm	2007/07/03 00:54:57	1.292
+++ deliantra/server/lib/cf.pm	2007/07/05 08:10:30	1.297
@@ -1414,7 +1414,10 @@
    s/(?<=\S)\n(?=\w)/ /g;
 
    # compress some whitespace
-   1 while s/\s*\n\s*\n\s*/\n/;
+   s/\s+\n/\n/g; # ws line-ends
+   s/\n\n+/\n/g; # double lines
+   s/^\n+//;     # beginning lines
+   s/\n+$//;     # ending lines
 
    $_
 }
@@ -2356,6 +2359,10 @@
 
    $self->enter_link;
 
+   # if exit is damned, update players death & WoR home-position
+   $self->contr->savebed ($slaying, $hp, $sp)
+      if $exit->flag (FLAG_DAMNED);
+
    (async {
       $self->deactivate_recursive; # just to be sure
       unless (eval {
@@ -2406,6 +2413,8 @@
 
    $msg = $self->pl->expand_cfpod ($msg);
 
+   return unless @extra || length $msg;
+
    if ($self->can_msg) {
       $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
    } else {
@@ -2575,15 +2584,24 @@
 
 The following functions and methods are available within a safe environment:
 
-  cf::object contr pay_amount pay_player map
-  cf::object::player player
-  cf::player peaceful
-  cf::map trigger
+  cf::object
+     contr pay_amount pay_player map x y force_find force_add
+     insert remove
+
+  cf::object::player
+     player
+
+  cf::player
+     peaceful
+
+  cf::map
+     trigger
 
 =cut
 
 for (
-   ["cf::object"         => qw(contr pay_amount pay_player map)],
+   ["cf::object"         => qw(contr pay_amount pay_player map force_find force_add x y
+                               insert remove)],
    ["cf::object::player" => qw(player)],
    ["cf::player"         => qw(peaceful)],
    ["cf::map"            => qw(trigger)],