ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/login.ext
(Generate patch)

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.40 by root, Mon Apr 16 15:50:49 2007 UTC vs.
Revision 1.90 by root, Tue Sep 16 16:03:02 2008 UTC

1#! perl # MANDATORY 1#! perl # mandatory
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use List::Util qw(min max);
8 7
9my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; 8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
10 9
11# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
12sub nuke_str { 11sub nuke_str {
13 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
14} 13}
… …
41 return unless cf::player::find_active $user; 40 return unless cf::player::find_active $user;
42 41
43 $ns->send_drawinfo ( 42 $ns->send_drawinfo (
44 "That player is already logged in on this server. " 43 "That player is already logged in on this server. "
45 . "If you want to create a new player, choose another name. " 44 . "If you want to create a new player, choose another name. "
46 . "If you are already a registered player, make sure nobody " 45 . "If you have already a registered, make sure nobody "
47 . "else is using your account at this time. If you lost your conenction " 46 . "else is using your account at this time. If you lost your connection "
48 . "then the server will likely timeout within a minute. If you still " 47 . "then the server will likely timeout within a minute. If you still "
49 . "cannot log-in after a minute, you are still logged in. Make sure " 48 . "cannot log-in after a minute, you are still logged in. Make sure "
50 . "you do not have another client running. If you use windows, reboot, " 49 . "you do not have another client running. If you use windows, reboot, "
51 . "this will fix anything.", 50 . "this will fix anything.",
52 cf::NDI_RED 51 cf::NDI_RED
53 ); 52 );
54 53
55 1 54 1
56} 55}
57 56
58sub check_clean_save { 57sub safe_spot($) {
59 my ($pl) = @_; 58 my ($pl) = @_;
59
60 my $ob = $pl->ob;
60 61
62 my $m = $ob->map
63 or return;
64 my $x = $ob->x;
65 my $y = $ob->y;
66
67# return 0;#d#
68# warn join ":", $m->at ($x, $y);#d#
69# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
70# return 0;
71
72 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
73}
74
75sub enter_map {
76 my ($pl) = @_;
77
78 warn $pl->ob->name, ": enter map 1\n";#d#
79 my $ob = $pl->ob;
80
81 my ($map, $x, $y)
82 = $ob->{_link_pos}
83 ? @{delete $ob->{_link_pos}}
84 : ($pl->maplevel, $ob->x, $ob->y);
85
86 warn $pl->ob->name, ": enter map 2\n";#d#
87 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
89
90 my $m = cf::map::find $map;
61 if (my $time = delete $pl->{unclean_save}) { 91 my $time = delete $pl->{unclean_save};
62 $pl->ns->send_drawinfo ( 92 warn $pl->ob->name, ": enter map 4\n";#d#
93
94 if ($time && $m) {
95 if ($time < $m->{instantiate_time}) {
96 # the map was reset in the meantime
97 my $age = $cf::RUNTIME - $time;
98
99 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
100
101 if ($age >= $MAX_DISCONNECT_TIME) {
102 $ob->message (
103 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
104 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
105 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
106 . "H<You disconnected too long without having used a savebed.>",
107 cf::NDI_RED
108 );
109 # kill them.
110 # reminds me of the famous badness 10000 syndrome...
111 $ob->stats->hp (-10000); #] if they survive this they deserved to live
112 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
113 } else {
114 ($map, $x, $y) = $pl->savebed;
115
116 $ob->message (
117 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
118 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
119 . "Better use a savebed next time, much worse things could have happened... "
120 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
121 cf::NDI_RED
122 );
123 }
124 } else {
125 $ob->message (
63 "You didn't use a savebed to leave this realm. This is very dangerous, " 126 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
64 . "as lots of things could happen when you leave by other means, such as cave-ins, " 127 . "as lots of things could happen when you leave by other means, such as cave-ins, "
65 . "or monsters suddenly snapping your body. Better use a savebed next time.", 128 . "or monsters suddenly snapping your body. Better use a savebed next time. "
129 . "H<Always apply a bed of reality to disconnect from the server.>",
66 cf::NDI_RED 130 cf::NDI_RED
67 ); 131 );
68 #d#TODO 132 }
69 } 133 }
134
135 warn $pl->ob->name, ": enter map 5\n";#d#
136 #$ob->goto ($map, $x, $y);
137 $ob->goto ($map, $x, $y, sub {
138 warn $pl->ob->name, ": enter map check\n";#d#
139 $_[0]
140 }, sub {
141 warn $pl->ob->name, ": enter map done\n";#d#
142 });
143 warn $pl->ob->name, ": enter map 6\n";#d#
144
70} 145}
71 146
72# delete a player directory, be non-blocking AND synchronous... 147# delete a player directory, be non-blocking AND synchronous...
73# (thats hard, so we crap out and fork). 148# (thats hard, so we crap out and fork).
74sub nuke_playerdir { 149sub nuke_playerdir {
75 my ($user) = @_; 150 my ($user) = @_;
76 151
77 aio_stat "$PLAYERDIR/$user"; 152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
78 system "cd \Q$PLAYERDIR\E "
79 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
80 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
81}
82 153
83sub send_capabilities { 154 cf::fork_call {
155 rename "$PLAYERDIR/$user", $temp;
156 system "rm", "-rf", $temp;
157 };
158}
159
160cf::client->attach (on_addme => sub {
84 my ($ns) = @_; 161 my ($ns) = @_;
85 162
86 return unless $ns->extcmd;
87
88 $ns->ext_event (capabilities =>
89 # id, name, flags (1 == 2d), edge length
90 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
91 );
92}
93
94sub setup {
95 my ($ns, $args) = @_;
96
97 # run through the cmds of setup
98 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
99 #
100 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
101 # The client then must sort this out
102
103 my %setup = split / +/, $args;
104 while (my ($k, $v) = each %setup) {
105 if ($k eq "sound") {
106 $ns->sound ($v);
107
108 } elsif ($k eq "exp64") {
109 $setup{$k} = 1;
110
111 } elsif ($k eq "spellmon") {
112 $ns->monitor_spells ($v);
113
114 } elsif ($k eq "darkness") {
115 $ns->darkness ($v);
116
117 } elsif ($k eq "map1cmd") {
118 $ns->mapmode (cf::Map1Cmd) if $v > 0;
119
120 } elsif ($k eq "map1acmd") {
121 $ns->mapmode (cf::Map1aCmd) if $v > 0;
122
123 } elsif ($k eq "map2cmd") {
124 # gcfclient bug, map1acmd is sent too late
125 $ns->mapmode (cf::Map1aCmd);
126 $setup{$k} = "FALSE";
127
128 } elsif ($k eq "newmapcmd") {
129 $ns->newmapcmd ($v);
130
131 } elsif ($k eq "mapinfocmd") {
132 $ns->mapinfocmd ($v);
133
134 } elsif ($k eq "extcmd") {
135 $ns->extcmd ($v > 0);
136 send_capabilities $ns;
137
138 } elsif ($k eq "extmap") {
139 $ns->extmap ($v);
140
141 } elsif ($k eq "facecache") {
142 if (!$v) {
143 $v = 1;
144 $setup{$k} = $v;
145 $ns->send_drawinfo ("(trying to force facecaching to be enabled)", cf::NDI_RED);
146 }
147
148 $ns->facecache ($v);
149
150 } elsif ($k eq "faceset") {
151 $ns->faceset (0);
152 $setup{$k} = 0;
153 # $ns->image2 (1)
154
155 } elsif ($k eq "tileset") {
156 $setup{$k} = $ns->faceset ($v & 1);
157
158 } elsif ($k eq "itemcmd") {
159 # Version of the item protocol command to use. Currently,
160 # only supported versions are 1 and 2. Using a numeric
161 # value will make it very easy to extend this in the future.
162 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
163
164 $setup{$k} = $ns->itemcmd;
165
166 } elsif ($k eq "mapsize") {
167 my ($x, $y) = split /x/, $v;
168
169 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
170 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
171
172 $setup{$k} = "${x}x${y}";
173
174 } elsif ($k eq "extendedMapInfos") {
175 $ns->ext_mapinfos ($v);
176
177 } elsif ($k eq "extendedTextInfos") {
178 $ns->has_readable_type ($v);
179
180 } elsif ($k eq "smoothing") { # cfplus-style smoothing
181 $ns->smoothing ($v);
182
183 } elsif ($k eq "fxix") {
184 $ns->fxix ($v);
185
186 } else {
187 # other commands:
188 # sexp: no idea, probably for oudated servers
189 # tick: more stupidity, server should sned a tick per tick
190
191 $setup{$k} = "FALSE";
192 }
193 }
194
195 $ns->send_packet (join " ", setup => %setup);
196
197 cf::datalog setup =>
198 request => $args,
199 reply => \%setup,
200 client => $ns->version,
201 ;
202}
203
204sub addme {
205 my ($ns) = @_;
206
207 if (!$ns->facecache) 163 if (!$ns->facecache)
208 { 164 {
209 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 165 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
210 166
211 167
212*** 168***
213*** WARNING: 169*** WARNING:
214*** Your client does not support face/image caching, 170*** Your client does not support face/image caching,
215*** or it has been disabled. Face caching is mandatory 171*** or it has been disabled. Face caching is mandatory
216*** so please enable it or use a newer client. 172*** so please enable it or use a newer client.
217*** 173***
218*** Look at your client preferences: 174*** Look at your client preferences:
219*** 175***
220*** CFPlus: all known versions automatically enable the facecache. 176*** deliantra: all known versions automatically enable the facecache.
221*** cfclient: use the -cache commandline option. 177*** cfclient: use the -cache commandline option.
222*** cfclient: map will not redraw automatically (bug). 178*** cfclient: map will not redraw automatically (bug).
223*** gcfclient: use -cache commandline option, or enable 179*** gcfclient: use -cache commandline option, or enable
224*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 180*** gcfclient: Client => Configure => Map & Image => Cache Images.
225*** jcrossclient: your client is broken, use CFPlus or gcfclient. 181*** jcrossclient: your client is broken, use deliantra or gcfclient.
226*** 182***
227*** 183***
228EOF 184EOF
229 if ($ns->version =~ /jcrossclient/) { 185 if ($ns->version =~ /jcrossclient/) {
230 # let them, for now 186 # let them, for now
… …
250 } 206 }
251 207
252 $ns->pl and return $ns->destroy; 208 $ns->pl and return $ns->destroy;
253 209
254 $ns->async (sub { 210 $ns->async (sub {
211 $Coro::current->{desc} = "addme init";
212
255 my ($user, $pass); 213 my ($user, $pass);
256 214
257 $ns->send_packet ("addme_success"); 215 $ns->send_packet ("addme_success");
258 216
259 for (;;) { 217 for (;;) {
… …
264 cf::NDI_BLUE 222 cf::NDI_BLUE
265 ); 223 );
266 224
267 # read username 225 # read username
268 while () { 226 while () {
269 $user = query $ns, 0, "What is your name?\n:"; 227 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
270 228
271 if ($cf::LOGIN_LOCK{$user}) { 229 if ($cf::LOGIN_LOCK{$user}) {
272 $ns->send_drawinfo ( 230 $ns->send_drawinfo (
273 "That username is currently used in another login session. " 231 "That username is currently used in another login session. "
274 . "Chose another, or wait till the other session has ended.", 232 . "Chose another, or wait till the other session has ended.",
… …
282 . "(only a-z, A-Z and 0-9 are allowed), " 240 . "(only a-z, A-Z and 0-9 are allowed), "
283 . "or is not between 3 and 18 characters in length.", 241 . "or is not between 3 and 18 characters in length.",
284 cf::NDI_RED 242 cf::NDI_RED
285 ); 243 );
286 } 244 }
245 Coro::Timer::sleep 0.4;
287 } 246 }
288 247
289 check_playing $ns, $user and next; 248 check_playing $ns, $user and next;
249
250 $Coro::current->{desc} = "addme($user) pass";
290 251
291 $ns->send_drawinfo ( 252 $ns->send_drawinfo (
292 "Welcome $user, please enter your password now. " 253 "Welcome $user, please enter your password now. "
293 . "New users should now choose a password. " 254 . "New users should now choose a password. "
294 . "Anything your client lets you enter is fine.", 255 . "Anything your client lets you enter is fine.",
… …
302 $ns->send_drawinfo ( 263 $ns->send_drawinfo (
303 "Try to use at least three characters as your password please, " 264 "Try to use at least three characters as your password please, "
304 . "that cannot be too much to ask for :)", 265 . "that cannot be too much to ask for :)",
305 cf::NDI_RED 266 cf::NDI_RED
306 ); 267 );
268 Coro::Timer::sleep 0.4;
307 } 269 }
308 270
309 # lock this username for the remainder of this login session 271 # lock this username for the remainder of this login session
310 if ($cf::LOGIN_LOCK{$user}) { 272 if ($cf::LOGIN_LOCK{$user}) {
311 $ns->send_drawinfo ( 273 $ns->send_drawinfo (
… …
317 } 279 }
318 local $cf::LOGIN_LOCK{$user} = 1; 280 local $cf::LOGIN_LOCK{$user} = 1;
319 281
320 check_playing $ns, $user and next; 282 check_playing $ns, $user and next;
321 283
284 $Coro::current->{desc} = "addme($user) check";
285
322 # try to read the user file and check the password 286 # try to read the user file and check the password
323 if (my $pl = cf::player::find $user) { 287 if (my $pl = cf::player::find $user) {
324 aio_stat $pl->path and next; 288 aio_stat $pl->path and next;
325 my $mtime = (stat _)[9]; 289 my $mtime = (stat _)[9];
326 my $hash = $pl->password; 290 my $hash = $pl->password;
… …
328 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 292 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
329 nuke_str $pass; 293 nuke_str $pass;
330 # password matches, wonderful 294 # password matches, wonderful
331 my $pl = cf::player::find $user or next; 295 my $pl = cf::player::find $user or next;
332 $pl->connect ($ns); 296 $pl->connect ($ns);
333 check_clean_save $pl; 297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
298 enter_map $pl;
334 last; 299 last;
335 } elsif (can_cleanup $pl, $mtime) { 300 } elsif (can_cleanup $pl, $mtime) {
336 Coro::Timer::sleep 1; 301 Coro::Timer::sleep 1;
337 302
338 $ns->send_drawinfo ( 303 $ns->send_drawinfo (
… …
379 next; 344 next;
380 } 345 }
381 } 346 }
382 347
383 # the rest of this function is character creation 348 # the rest of this function is character creation
349 $Coro::current->{desc} = "addme($user) chargen";
384 350
385 # just to make sure nothing is left over 351 # just to make sure nothing is left over
386 nuke_playerdir $user; 352 nuke_playerdir $user;
387 353
388 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 354 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
392 nuke_str $pass2; 358 nuke_str $pass2;
393 $ns->send_drawinfo ( 359 $ns->send_drawinfo (
394 "The passwords do not match, please try again.", 360 "The passwords do not match, please try again.",
395 cf::NDI_RED 361 cf::NDI_RED
396 ); 362 );
363 Coro::Timer::sleep 0.5;
397 next; 364 next;
398 } 365 }
399 366
400 nuke_str $pass2; 367 nuke_str $pass2;
401 368
402 my $pl = cf::player::new $user; 369 my $pl = cf::player::new $user;
403 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 370 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
404 nuke_str $pass; 371 nuke_str $pass;
405 $pl->connect ($ns); 372 $pl->connect ($ns);
406
407 my $ob = $pl->ob; 373 my $ob = $pl->ob;
374
375 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
408 376
409 while () { 377 while () {
410 $ob->update_stats; 378 $ob->update_stats;
411 $pl->save_stats; 379 $pl->save_stats;
412 380
… …
422 $ob->swap_stats ($res - 1, $swap - 1); 390 $ob->swap_stats ($res - 1, $swap - 1);
423 } 391 }
424 } else { 392 } else {
425 $ob->roll_stats; 393 $ob->roll_stats;
426 } 394 }
395
396 Coro::Timer::sleep 0.05;
427 } 397 }
428 398
429 $ob->set_animation (2); 399 $ob->set_animation (2);
430 $ob->add_statbonus; 400 $ob->add_statbonus;
431 401
432 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 402 while () {
433 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 403 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
404 my $msg = $ob->msg;
405 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
406 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
407
408 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
434 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 409 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
435 410
436 $ns->state (cf::ST_CHANGE_CLASS); 411 last if $res =~ /[dD]/;
412
413 $pl->chargen_race_next;
414 Coro::Timer::sleep 0.2;
415 }
416
417 # create the playerdir, if necessary, as chargen_race_done did it before
418 # presumably because of unique maps
419 aio_mkdir playerdir $pl, 0770;
420 $pl->chargen_race_done;
421
422 while () {
423 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
424 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
425
426 if ($res =~ /^[fF]/) {
427 $pl->gender (1);
428 last;
429 } elsif ($res =~ /^[mM]/) {
430 $pl->gender (0);
431 last;
432 }
433 Coro::Timer::sleep 0.2;
434 }
435
436 $ob->reply (undef, "Welcome to Deliantra!");
437
437 delete $pl->{deny_save};#d# too early 438 delete $pl->{deny_save};
438 439
439 last; 440 last;
440 } 441 }
441 }); 442 });
442} 443});
443 444
444cf::register_command quit => sub { 445cf::register_command quit => sub {
445 my ($ob, $arg) = @_; 446 my ($ob, $arg) = @_;
446 447
447 $ob->reply (undef, 448 $ob->reply (undef,
… …
481 482
482 # update respawn position 483 # update respawn position
483 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 484 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
484 cf::async { $pl->save }; 485 cf::async { $pl->save };
485 486
486 $pl->killer ("left"); 487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
487 $ob->check_score; 488 $ob->check_score;
488 489
489 $ob->reply (undef, "In the future, you will wake up here when you die."); 490 $ob->reply (undef, "In the future, you will wake up here when you die.");
490 491
491 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 492 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
… …
513 514
514 if ($cleanly) { 515 if ($cleanly) {
515 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 516 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
516 } else { 517 } else {
517 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 518 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
518 $pl->{unclean_save} = $cf::RUNTIME; 519 $pl->{unclean_save} = $cf::RUNTIME
520 unless safe_spot $pl;
519 } 521 }
520 }, 522 },
521); 523);
522 524
523cf::client->attach (
524 on_addme => \&addme,
525 on_setup => \&setup,
526);
527
528############################################################################# 525#############################################################################
529 526
530our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 527our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
531our $SAVE_TIMEOUT = 20; # save players every n seconds 528our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
532 529
533our $SCHEDULER = cf::async_ext { 530our $SCHEDULER = cf::async_ext {
534 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 531 $Coro::current->{desc} = "player scheduler";
532
535 while () { 533 while () {
536 $schedule_interval->next; 534 Coro::EV::timer_once $SCHEDULE_INTERVAL;
537 535
538 # this weird form of iteration over values is used because 536 # this weird form of iteration over values is used because
539 # the hash changes underneath us frequently, and for 537 # the hash changes underneath us frequently, and for
540 # keeps a direct reference to the value without (in 5.8 perls) 538 # keeps a direct reference to the value without (in 5.8 perls)
541 # keeping a reference, so this is prone to crashes or worse. 539 # keeping a reference, so this is prone to crashes or worse.
… …
545 or next; 543 or next;
546 $pl->valid or next; 544 $pl->valid or next;
547 545
548 eval { 546 eval {
549 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 547 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
550 cf::wait_for_tick_begin;
551 $pl->save; 548 $pl->save;
552 549
553 unless ($pl->active) { 550 unless ($pl->active || $pl->ns) {
554 # check refcounts, this is tricky and needs to be adjusted to fit server internals 551 # check refcounts, this is tricky and needs to be adjusted to fit server internals
555 my $ob = $pl->ob; 552 my $ob = $pl->ob;
556 Scalar::Util::weaken $pl; 553
557 Scalar::Util::weaken $ob;
558 my $a_ = $pl->refcnt;#d#
559 my $b_ = $ob->refcnt;#d#
560 my $pl_ref = $pl->refcnt_cnt; 554 my $pl_ref = $pl->refcnt_cnt;
561 my $ob_ref = $ob->refcnt_cnt; 555 my $ob_ref = $ob->refcnt_cnt;
562 556
563 ## pl_ref == one from object + one from cf::PLAYER 557 ## pl_ref == $pl + ob->contr + %cf::PLAYER
564 ## ob_ref == one from simply being an object 558 ## ob_ref == $ob + pl->observe + simply being an object
565 if ($pl_ref == 2 && $ob_ref == 1) { 559 if ($pl_ref == 3 && $ob_ref == 3) {
566 warn "player-scheduler destroy ", $ob->name;#d# 560 warn "player-scheduler destroy ", $ob->name;#d#
567 561
568 # remove from sight and get fresh "copies" 562 # remove from sight and get fresh "copies"
569 $pl = delete $cf::PLAYER{$ob->name}; 563 $pl = delete $cf::PLAYER{$ob->name};
570 $ob = $pl->ob; 564 $ob = $pl->ob;
571 565
572 $ob->destroy;
573 $pl->destroy; 566 $pl->destroy; # destroys $ob
574 } else { 567 } else {
568 my $a_ = $pl->refcnt;#d#
569 my $b_ = $ob->refcnt;#d#
570
575 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 571 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
576 } 572 }
577 } 573 }
578 } 574 }
579 }; 575 };
580 warn $@ if $@; 576 warn $@ if $@;
581 Coro::cede; 577 cf::cede_to_tick;
582 }; 578 };
583 } 579 }
584}; 580};
585 581
586$SCHEDULER->prio (1); 582$SCHEDULER->prio (1);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines