--- deliantra/server/ext/login.ext	2007/01/07 21:54:59	1.12
+++ deliantra/server/ext/login.ext	2007/01/08 14:11:05	1.17
@@ -160,6 +160,7 @@
                my $pl = cf::player::find $user or next;
                $pl->connect ($ns);
                check_clean_save $pl;
+               $pl->{clean_save} = 1;
                last;
             } elsif (can_cleanup $buf, $mtime) {
                Coro::Timer::sleep 1;
@@ -293,7 +294,7 @@
 
       return cf::override 0 unless $ob->type == cf::PLAYER;
 
-      my $pl = $ob->pl;
+      my $pl = $ob->contr;
 
       # update respawn position
       $pl->savebed ($bed->map->path, $bed->x, $bed->y);
@@ -309,10 +310,7 @@
             $pl->deactivate;
             $pl->ns->destroy;
          } else {
-            cf::async {
-               $pl->{clean_save} = 1;
-               $pl->save;
-            };
+            cf::async { $pl->save };
          }
       });
    },
@@ -333,6 +331,7 @@
          $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
       } else {
          $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
+         delete $pl->{clean_save};
       }
    },
 );
@@ -344,8 +343,7 @@
 #############################################################################
 
 our $SCHEDULE_INTERVAL  =   10; # time the player scheduler sleeps between runs
-our $SWAP_TIMEOUT       =   30; # time after which an unused player is evicted form memory
-our $SAVE_TIMEOUT       =   20; # save players every n seconds
+our $SAVE_TIMEOUT       =  200; # save players every n seconds
 our $SAVE_INTERVAL      =  0.1; # save at max. one player every $SAVE_INTERVAL
 
 our $SCHEDULER = cf::async_ext {
@@ -367,6 +365,28 @@
                $pl->save;
                Coro::Timer::sleep $SAVE_INTERVAL;
             }
+
+            unless ($pl->active) {
+               # check refcounts, this is tricky and needs to be adjusted to fit server internals
+               my $ob = $pl->ob;
+               Scalar::Util::weaken $pl;
+               Scalar::Util::weaken $ob;
+               my $a_ = $pl->refcnt;
+               my $b_ = $ob->refcnt;
+               my $pl_ref = $pl->refcnt_cnt;
+               my $ob_ref = $ob->refcnt_cnt;
+
+               if ($pl_ref == 2 && $ob_ref == 1) {
+                  warn "player-scheduler destroy ", $ob->name;#d#
+                  delete $cf::PLAYER{$ob->name};
+                  # pl_ref == one from object + one from cf::PLAYER
+                  # ob_ref == one from simply being an object
+                  $ob->destroy;
+                  $pl->destroy;
+               } else {
+                  warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d#
+               }
+            }
          };
          warn $@ if $@;
          Coro::cede;