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.47 by root, Fri Apr 27 17:16:13 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); 7
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
8 9
9# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
10sub nuke_str { 11sub nuke_str {
11 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
12} 13}
… …
39 return unless cf::player::find_active $user; 40 return unless cf::player::find_active $user;
40 41
41 $ns->send_drawinfo ( 42 $ns->send_drawinfo (
42 "That player is already logged in on this server. " 43 "That player is already logged in on this server. "
43 . "If you want to create a new player, choose another name. " 44 . "If you want to create a new player, choose another name. "
44 . "If you are already a registered player, make sure nobody " 45 . "If you have already a registered, make sure nobody "
45 . "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 "
46 . "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 "
47 . "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 "
48 . "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, "
49 . "this will fix anything.", 50 . "this will fix anything.",
50 cf::NDI_RED 51 cf::NDI_RED
51 ); 52 );
52 53
53 1 54 1
54} 55}
55 56
56sub check_clean_save { 57sub safe_spot($) {
57 my ($pl) = @_; 58 my ($pl) = @_;
59
60 my $ob = $pl->ob;
58 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;
59 if (my $time = delete $pl->{unclean_save}) { 91 my $time = delete $pl->{unclean_save};
60 $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 (
61 "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, "
62 . "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, "
63 . "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.>",
64 cf::NDI_RED 130 cf::NDI_RED
65 ); 131 );
66 #d#TODO 132 }
67 } 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
68} 145}
69 146
70# delete a player directory, be non-blocking AND synchronous... 147# delete a player directory, be non-blocking AND synchronous...
71# (thats hard, so we crap out and fork). 148# (thats hard, so we crap out and fork).
72sub nuke_playerdir { 149sub nuke_playerdir {
73 my ($user) = @_; 150 my ($user) = @_;
74 151
75 aio_stat "$PLAYERDIR/$user"; 152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
76 system "cd \Q$PLAYERDIR\E "
77 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
78 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
79}
80 153
81sub 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 {
82 my ($ns) = @_; 161 my ($ns) = @_;
83 162
84 return unless $ns->extcmd;
85
86 $ns->ext_event (capabilities =>
87 # id, name, flags (1 == 2d), edge length
88 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
89 );
90}
91
92sub setup {
93 my ($ns, $args) = @_;
94
95 # run through the cmds of setup
96 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
97 #
98 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
99 # The client then must sort this out
100
101 my %setup = split / +/, $args;
102 while (my ($k, $v) = each %setup) {
103 if ($k eq "sound") {
104 $ns->sound ($v);
105
106 } elsif ($k eq "exp64") {
107 $setup{$k} = 1;
108
109 } elsif ($k eq "spellmon") {
110 $ns->monitor_spells ($v);
111
112 } elsif ($k eq "darkness") {
113 $ns->darkness ($v);
114
115 } elsif ($k eq "map1cmd") {
116 $ns->mapmode (cf::Map1Cmd) if $v > 0;
117
118 } elsif ($k eq "map1acmd") {
119 $ns->mapmode (cf::Map1aCmd) if $v > 0;
120
121 } elsif ($k eq "map2cmd") {
122 # gcfclient bug, map1acmd is sent too late
123 $ns->mapmode (cf::Map1aCmd);
124 $setup{$k} = "FALSE";
125
126 } elsif ($k eq "newmapcmd") {
127 $ns->newmapcmd ($v);
128
129 } elsif ($k eq "mapinfocmd") {
130 $ns->mapinfocmd ($v);
131
132 } elsif ($k eq "extcmd") {
133 $ns->extcmd ($v > 0);
134 send_capabilities $ns;
135
136 } elsif ($k eq "extmap") {
137 $ns->extmap ($v);
138
139 } elsif ($k eq "facecache") {
140 if (!$v) {
141 $v = 1;
142 $setup{$k} = $v;
143 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
144 }
145
146 $ns->facecache ($v);
147
148 } elsif ($k eq "faceset") {
149 $ns->faceset (0);
150 $setup{$k} = 0;
151 # $ns->image2 (1)
152
153 } elsif ($k eq "tileset") {
154 $setup{$k} = $ns->faceset ($v & 1);
155
156 } elsif ($k eq "itemcmd") {
157 # Version of the item protocol command to use. Currently,
158 # only supported versions are 1 and 2. Using a numeric
159 # value will make it very easy to extend this in the future.
160 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
161
162 $setup{$k} = $ns->itemcmd;
163
164 } elsif ($k eq "mapsize") {
165 my ($x, $y) = split /x/, $v;
166
167 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
168 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
169
170 $setup{$k} = "${x}x${y}";
171
172 } elsif ($k eq "extendedMapInfos") {
173 $ns->ext_mapinfos ($v);
174
175 } elsif ($k eq "extendedTextInfos") {
176 $ns->has_readable_type ($v);
177
178 } elsif ($k eq "smoothing") { # cfplus-style smoothing
179 $ns->smoothing ($v);
180
181 } elsif ($k eq "fxix") {
182 $ns->fxix ($v);
183
184 } elsif ($k eq "msg") {
185 $ns->can_msg ($v);
186
187 } elsif ($k eq "excmd") {
188 # we support it
189
190 } else {
191 # other commands:
192 # sexp: no idea, probably for oudated servers
193 # tick: more stupidity, server should send a tick per tick
194
195 $setup{$k} = "FALSE";
196 }
197 }
198
199 $ns->send_packet (join " ", setup => %setup);
200
201 cf::datalog setup =>
202 request => $args,
203 reply => \%setup,
204 client => $ns->version,
205 ;
206}
207
208sub addme {
209 my ($ns) = @_;
210
211 if (!$ns->facecache) 163 if (!$ns->facecache)
212 { 164 {
213 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 165 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
214 166
215 167
216*** 168***
217*** WARNING: 169*** WARNING:
218*** Your client does not support face/image caching, 170*** Your client does not support face/image caching,
219*** or it has been disabled. Face caching is mandatory 171*** or it has been disabled. Face caching is mandatory
220*** so please enable it or use a newer client. 172*** so please enable it or use a newer client.
221*** 173***
222*** Look at your client preferences: 174*** Look at your client preferences:
223*** 175***
224*** CFPlus: all known versions automatically enable the facecache. 176*** deliantra: all known versions automatically enable the facecache.
225*** cfclient: use the -cache commandline option. 177*** cfclient: use the -cache commandline option.
226*** cfclient: map will not redraw automatically (bug). 178*** cfclient: map will not redraw automatically (bug).
227*** gcfclient: use -cache commandline option, or enable 179*** gcfclient: use -cache commandline option, or enable
228*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 180*** gcfclient: Client => Configure => Map & Image => Cache Images.
229*** jcrossclient: your client is broken, use CFPlus or gcfclient. 181*** jcrossclient: your client is broken, use deliantra or gcfclient.
230*** 182***
231*** 183***
232EOF 184EOF
233 if ($ns->version =~ /jcrossclient/) { 185 if ($ns->version =~ /jcrossclient/) {
234 # let them, for now 186 # let them, for now
… …
254 } 206 }
255 207
256 $ns->pl and return $ns->destroy; 208 $ns->pl and return $ns->destroy;
257 209
258 $ns->async (sub { 210 $ns->async (sub {
211 $Coro::current->{desc} = "addme init";
212
259 my ($user, $pass); 213 my ($user, $pass);
260 214
261 $ns->send_packet ("addme_success"); 215 $ns->send_packet ("addme_success");
262 216
263 for (;;) { 217 for (;;) {
… …
268 cf::NDI_BLUE 222 cf::NDI_BLUE
269 ); 223 );
270 224
271 # read username 225 # read username
272 while () { 226 while () {
273 $user = query $ns, 0, "What is your name?\n:"; 227 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
274 228
275 if ($cf::LOGIN_LOCK{$user}) { 229 if ($cf::LOGIN_LOCK{$user}) {
276 $ns->send_drawinfo ( 230 $ns->send_drawinfo (
277 "That username is currently used in another login session. " 231 "That username is currently used in another login session. "
278 . "Chose another, or wait till the other session has ended.", 232 . "Chose another, or wait till the other session has ended.",
… …
286 . "(only a-z, A-Z and 0-9 are allowed), " 240 . "(only a-z, A-Z and 0-9 are allowed), "
287 . "or is not between 3 and 18 characters in length.", 241 . "or is not between 3 and 18 characters in length.",
288 cf::NDI_RED 242 cf::NDI_RED
289 ); 243 );
290 } 244 }
245 Coro::Timer::sleep 0.4;
291 } 246 }
292 247
293 check_playing $ns, $user and next; 248 check_playing $ns, $user and next;
249
250 $Coro::current->{desc} = "addme($user) pass";
294 251
295 $ns->send_drawinfo ( 252 $ns->send_drawinfo (
296 "Welcome $user, please enter your password now. " 253 "Welcome $user, please enter your password now. "
297 . "New users should now choose a password. " 254 . "New users should now choose a password. "
298 . "Anything your client lets you enter is fine.", 255 . "Anything your client lets you enter is fine.",
… …
306 $ns->send_drawinfo ( 263 $ns->send_drawinfo (
307 "Try to use at least three characters as your password please, " 264 "Try to use at least three characters as your password please, "
308 . "that cannot be too much to ask for :)", 265 . "that cannot be too much to ask for :)",
309 cf::NDI_RED 266 cf::NDI_RED
310 ); 267 );
268 Coro::Timer::sleep 0.4;
311 } 269 }
312 270
313 # lock this username for the remainder of this login session 271 # lock this username for the remainder of this login session
314 if ($cf::LOGIN_LOCK{$user}) { 272 if ($cf::LOGIN_LOCK{$user}) {
315 $ns->send_drawinfo ( 273 $ns->send_drawinfo (
… …
321 } 279 }
322 local $cf::LOGIN_LOCK{$user} = 1; 280 local $cf::LOGIN_LOCK{$user} = 1;
323 281
324 check_playing $ns, $user and next; 282 check_playing $ns, $user and next;
325 283
284 $Coro::current->{desc} = "addme($user) check";
285
326 # try to read the user file and check the password 286 # try to read the user file and check the password
327 if (my $pl = cf::player::find $user) { 287 if (my $pl = cf::player::find $user) {
328 aio_stat $pl->path and next; 288 aio_stat $pl->path and next;
329 my $mtime = (stat _)[9]; 289 my $mtime = (stat _)[9];
330 my $hash = $pl->password; 290 my $hash = $pl->password;
… …
332 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) {
333 nuke_str $pass; 293 nuke_str $pass;
334 # password matches, wonderful 294 # password matches, wonderful
335 my $pl = cf::player::find $user or next; 295 my $pl = cf::player::find $user or next;
336 $pl->connect ($ns); 296 $pl->connect ($ns);
337 check_clean_save $pl; 297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
298 enter_map $pl;
338 last; 299 last;
339 } elsif (can_cleanup $pl, $mtime) { 300 } elsif (can_cleanup $pl, $mtime) {
340 Coro::Timer::sleep 1; 301 Coro::Timer::sleep 1;
341 302
342 $ns->send_drawinfo ( 303 $ns->send_drawinfo (
… …
383 next; 344 next;
384 } 345 }
385 } 346 }
386 347
387 # the rest of this function is character creation 348 # the rest of this function is character creation
349 $Coro::current->{desc} = "addme($user) chargen";
388 350
389 # just to make sure nothing is left over 351 # just to make sure nothing is left over
390 nuke_playerdir $user; 352 nuke_playerdir $user;
391 353
392 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.";
… …
396 nuke_str $pass2; 358 nuke_str $pass2;
397 $ns->send_drawinfo ( 359 $ns->send_drawinfo (
398 "The passwords do not match, please try again.", 360 "The passwords do not match, please try again.",
399 cf::NDI_RED 361 cf::NDI_RED
400 ); 362 );
363 Coro::Timer::sleep 0.5;
401 next; 364 next;
402 } 365 }
403 366
404 nuke_str $pass2; 367 nuke_str $pass2;
405 368
406 my $pl = cf::player::new $user; 369 my $pl = cf::player::new $user;
407 $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]);
408 nuke_str $pass; 371 nuke_str $pass;
409 $pl->connect ($ns); 372 $pl->connect ($ns);
410
411 my $ob = $pl->ob; 373 my $ob = $pl->ob;
374
375 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
412 376
413 while () { 377 while () {
414 $ob->update_stats; 378 $ob->update_stats;
415 $pl->save_stats; 379 $pl->save_stats;
416 380
… …
426 $ob->swap_stats ($res - 1, $swap - 1); 390 $ob->swap_stats ($res - 1, $swap - 1);
427 } 391 }
428 } else { 392 } else {
429 $ob->roll_stats; 393 $ob->roll_stats;
430 } 394 }
395
396 Coro::Timer::sleep 0.05;
431 } 397 }
432 398
433 $ob->set_animation (2); 399 $ob->set_animation (2);
434 $ob->add_statbonus; 400 $ob->add_statbonus;
435 401
436 while () { 402 while () {
437 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 403 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
438 my $msg = $ob->msg; 404 my $msg = $ob->msg;
439 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 405 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
440 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 406 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
441 407
442 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 408 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
443 "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";
444 410
445 last if $res =~ /[dD]/; 411 last if $res =~ /[dD]/;
446 412
447 $pl->chargen_race_next; 413 $pl->chargen_race_next;
414 Coro::Timer::sleep 0.2;
448 } 415 }
449 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;
450 $pl->chargen_race_done; 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!");
451 437
452 delete $pl->{deny_save}; 438 delete $pl->{deny_save};
453 439
454 last; 440 last;
455 } 441 }
456 }); 442 });
457} 443});
458 444
459cf::register_command quit => sub { 445cf::register_command quit => sub {
460 my ($ob, $arg) = @_; 446 my ($ob, $arg) = @_;
461 447
462 $ob->reply (undef, 448 $ob->reply (undef,
… …
496 482
497 # update respawn position 483 # update respawn position
498 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 484 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
499 cf::async { $pl->save }; 485 cf::async { $pl->save };
500 486
501 $pl->killer ("left"); 487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
502 $ob->check_score; 488 $ob->check_score;
503 489
504 $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.");
505 491
506 $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 {
… …
528 514
529 if ($cleanly) { 515 if ($cleanly) {
530 $_->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;
531 } else { 517 } else {
532 $_->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;
533 $pl->{unclean_save} = $cf::RUNTIME; 519 $pl->{unclean_save} = $cf::RUNTIME
520 unless safe_spot $pl;
534 } 521 }
535 }, 522 },
536); 523);
537 524
538cf::client->attach (
539 on_addme => \&addme,
540 on_setup => \&setup,
541);
542
543############################################################################# 525#############################################################################
544 526
545our $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
546our $SAVE_TIMEOUT = 20; # save players every n seconds 528our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
547 529
548our $SCHEDULER = cf::async_ext { 530our $SCHEDULER = cf::async_ext {
549 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 531 $Coro::current->{desc} = "player scheduler";
532
550 while () { 533 while () {
551 $schedule_interval->next; 534 Coro::EV::timer_once $SCHEDULE_INTERVAL;
552 535
553 # this weird form of iteration over values is used because 536 # this weird form of iteration over values is used because
554 # the hash changes underneath us frequently, and for 537 # the hash changes underneath us frequently, and for
555 # 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)
556 # keeping a reference, so this is prone to crashes or worse. 539 # keeping a reference, so this is prone to crashes or worse.
… …
560 or next; 543 or next;
561 $pl->valid or next; 544 $pl->valid or next;
562 545
563 eval { 546 eval {
564 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 547 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
565 cf::wait_for_tick_begin;
566 $pl->save; 548 $pl->save;
567 549
568 unless ($pl->active) { 550 unless ($pl->active || $pl->ns) {
569 # 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
570 my $ob = $pl->ob; 552 my $ob = $pl->ob;
571 Scalar::Util::weaken $pl; 553
572 Scalar::Util::weaken $ob;
573 my $a_ = $pl->refcnt;#d#
574 my $b_ = $ob->refcnt;#d#
575 my $pl_ref = $pl->refcnt_cnt; 554 my $pl_ref = $pl->refcnt_cnt;
576 my $ob_ref = $ob->refcnt_cnt; 555 my $ob_ref = $ob->refcnt_cnt;
577 556
578 ## pl_ref == one from object + one from cf::PLAYER 557 ## pl_ref == $pl + ob->contr + %cf::PLAYER
579 ## ob_ref == one from simply being an object 558 ## ob_ref == $ob + pl->observe + simply being an object
580 if ($pl_ref == 2 && $ob_ref == 1) { 559 if ($pl_ref == 3 && $ob_ref == 3) {
581 warn "player-scheduler destroy ", $ob->name;#d# 560 warn "player-scheduler destroy ", $ob->name;#d#
582 561
583 # remove from sight and get fresh "copies" 562 # remove from sight and get fresh "copies"
584 $pl = delete $cf::PLAYER{$ob->name}; 563 $pl = delete $cf::PLAYER{$ob->name};
585 $ob = $pl->ob; 564 $ob = $pl->ob;
586 565
587 $ob->destroy;
588 $pl->destroy; 566 $pl->destroy; # destroys $ob
589 } else { 567 } else {
568 my $a_ = $pl->refcnt;#d#
569 my $b_ = $ob->refcnt;#d#
570
590 warn "player-scheduler refcnt ", $ob->name, " pp$pl_ref,pc$a_ op$ob_ref,oc$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#
591 } 572 }
592 } 573 }
593 } 574 }
594 }; 575 };
595 warn $@ if $@; 576 warn $@ if $@;
596 Coro::cede; 577 cf::cede_to_tick;
597 }; 578 };
598 } 579 }
599}; 580};
600 581
601$SCHEDULER->prio (1); 582$SCHEDULER->prio (1);

Diff Legend

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