--- deliantra/server/ext/ipo.ext	2007/01/07 02:39:14	1.4
+++ deliantra/server/ext/ipo.ext	2007/09/27 01:21:26	1.10
@@ -21,7 +21,7 @@
       sub { $_[0]->value (1000 * $price_fact) }
    ],
    mailscroll => [
-      1, 'scroll',
+      1, 'mailscroll_empty',
       sub {
          $_[0]->name    ("mailscroll T: $_[2] F: $_[1]");
          $_[0]->name_pl ("mailscrolls T: $_[2] F: $_[1]");
@@ -120,7 +120,7 @@
          $mail->name_pl ("$type->[1]s F: $from T: " .$pl->name);
          $mail->msg     ($msg);
          $mail->value   (0);
-         $mail->insert_in_ob ($box);
+         $box->insert ($mail);
       }
 
       $cnt += @$mails;
@@ -186,25 +186,30 @@
       }
 
    } elsif ($cmd eq 'receive') {
-      my $storage = cf::map::find ("/planes/IPO_storage");
-      unless ($storage) {
-         $who->reply ($npc, "Sorry, our package delivery service is currently in strike. Please come back later.");
-         return 1;
-      }
+      cf::async {
+         $Coro::current->{desc} = "ipo receive";
 
-      my $plname = $who->name;
-      my $cnt;
-      for ($storage->at (2, 2)) {
-         if ($_->name () =~ /^\S+ F: \S+ T: \Q$plname\E$/) {
-            $_->insert_in_ob ($who);
-            $cnt++;
+         my $storage = cf::map::find ("/planes/IPO_storage");
+         unless ($storage) {
+            $who->reply ($npc, "Sorry, our package delivery service is currently in strike. Please come back later.");
+            return 1;
          }
-      }
+         $storage->load;
 
-      if ($cnt) {
-         $who->reply ($npc, $cnt == 1 ? "Here is your pakage." : "Here are your packages.");
-      } else {
-         $who->reply ($npc, "Sorry, no deliverys for you sir.");
+         my $plname = $who->name;
+         my $cnt;
+         for ($storage->at (2, 2)) {
+            if ($_->name () =~ /^\S+ F: \S+ T: \Q$plname\E$/) {
+               $who->insert ($_);
+               $cnt++;
+            }
+         }
+
+         if ($cnt) {
+            $who->reply ($npc, $cnt == 1 ? "Here is your package." : "Here are your packages.");
+         } else {
+            $who->reply ($npc, "Sorry, no deliveries for you sir.");
+         }
       }
 
    } elsif ($cmd eq 'send') {
@@ -213,27 +218,32 @@
          return 1;
       }
 
-      my $storage = cf::map::find ("/planes/IPO_storage");
-      unless ($storage) {
-         $who->reply ($npc, "Sorry, our package delivery service is currently in strike. Please come back later.");
-         return 1;
-      }
+      cf::async {
+         $Coro::current->{desc} = "ipo send";
 
-      my $cnt;
-      for ($who->inv) {
-         if ($_->name () =~ /^(bag|package|carton) T: \Q$arguments\E F: (\S+)$/) {
-            $_->name ("$1 F: $2 T: $arguments");
-            $_->teleport ($storage, 2, 2);
-            $cnt++;
+         my $storage = cf::map::find ("/planes/IPO_storage");
+         unless ($storage) {
+            $who->reply ($npc, "Sorry, our package delivery service is currently in strike. Please come back later.");
+            return 1;
          }
-      }
+         $storage->load;
 
-      if ($cnt) {
-         $who->reply ($npc, $cnt == 1 ? "Package sent to $arguments." : "Sent $cnt packages to $arguments\n");
-         CFMail::send_mail (1, $arguments, $who->name, "You got $cnt packages from " . $who->name);
-         notify_players ($arguments => 1);
-      } else {
-         $who->reply ($npc, "Sorry, found no package to send to $arguments.");
+         my $cnt;
+         for ($who->inv) {
+            if ($_->name () =~ /^(bag|package|carton) T: \Q$arguments\E F: (\S+)$/) {
+               $_->name ("$1 F: $2 T: $arguments");
+               $_->teleport ($storage, 2, 2);
+               $cnt++;
+            }
+         }
+
+         if ($cnt) {
+            $who->reply ($npc, $cnt == 1 ? "Package sent to $arguments." : "Sent $cnt packages to $arguments\n");
+            CFMail::send_mail (1, $arguments, $who->name, "You got $cnt packages from " . $who->name);
+            notify_players ($arguments => 1);
+         } else {
+            $who->reply ($npc, "Sorry, found no package to send to $arguments.");
+         }
       }
 
    } else {
@@ -260,7 +270,7 @@
 use POSIX qw/strftime/;
 use CFDB;
 
-my $MAILDB = CFDB->new (db_file => cf::localdir . "/crossfiremail");
+my $MAILDB = CFDB->new (db_file => "$LOCALDIR/crossfiremail");
 
 sub get_mail {
    my ($toname) = @_;