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.48 by root, Sat May 26 15:44:03 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
57sub safe_spot($) {
58 my ($pl) = @_;
59
60 my $ob = $pl->ob;
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
56sub enter_map { 75sub enter_map {
57 my ($pl) = @_; 76 my ($pl) = @_;
58 77
78 warn $pl->ob->name, ": enter map 1\n";#d#
79 my $ob = $pl->ob;
80
59 my ($map, $x, $y) 81 my ($map, $x, $y)
60 = $pl->ob->{_link_pos} 82 = $ob->{_link_pos}
61 ? @{delete $pl->ob->{_link_pos}} 83 ? @{delete $ob->{_link_pos}}
62 : ($pl->maplevel, $pl->ob->x, $pl->ob->y); 84 : ($pl->maplevel, $ob->x, $ob->y);
63 85
86 warn $pl->ob->name, ": enter map 2\n";#d#
64 $pl->ob->enter_link; 87 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
65 89
90 my $m = cf::map::find $map;
66 if (my $time = delete $pl->{unclean_save}) { 91 my $time = delete $pl->{unclean_save};
67 if (my $m = cf::map::find $map) { 92 warn $pl->ob->name, ": enter map 4\n";#d#
93
94 if ($time && $m) {
68 if ($time < $m->{instantiate_time}) { 95 if ($time < $m->{instantiate_time}) {
69 # the map was reset in the meantime 96 # the map was reset in the meantime
70 my $age = $cf::RUNTIME - $time; 97 my $age = $cf::RUNTIME - $time;
98
71 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d# 99 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
72 100
73 # for now, just go back to savebed 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 {
74 ($map, $x, $y) = $pl->savebed; 114 ($map, $x, $y) = $pl->savebed;
75 115
76 $pl->ns->send_drawinfo ( 116 $ob->message (
77 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 117 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
78 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " 118 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
79 . "Better use a savebed next time, much worse things could have happened...", 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.>",
80 cf::NDI_RED 121 cf::NDI_RED
81 ); 122 );
123 }
82 } else { 124 } else {
83 $pl->ns->send_drawinfo ( 125 $ob->message (
84 "You didn't use a bed to reality 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, "
85 . "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, "
86 . "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.>",
87 cf::NDI_RED 130 cf::NDI_RED
88 ); 131 );
89 }
90 } 132 }
91 } 133 }
92 134
135 warn $pl->ob->name, ": enter map 5\n";#d#
93 $pl->ob->goto ($map, $x, $y); 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
94} 145}
95 146
96# delete a player directory, be non-blocking AND synchronous... 147# delete a player directory, be non-blocking AND synchronous...
97# (thats hard, so we crap out and fork). 148# (thats hard, so we crap out and fork).
98sub nuke_playerdir { 149sub nuke_playerdir {
99 my ($user) = @_; 150 my ($user) = @_;
100 151
101 aio_stat "$PLAYERDIR/$user"; 152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
102 system "cd \Q$PLAYERDIR\E "
103 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
104 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
105}
106 153
107sub 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 {
108 my ($ns) = @_; 161 my ($ns) = @_;
109 162
110 return unless $ns->extcmd;
111
112 $ns->ext_event (capabilities =>
113 # id, name, flags (1 == 2d), edge length
114 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
115 );
116}
117
118sub setup {
119 my ($ns, $args) = @_;
120
121 # run through the cmds of setup
122 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
123 #
124 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
125 # The client then must sort this out
126
127 my %setup = split / +/, $args;
128 while (my ($k, $v) = each %setup) {
129 if ($k eq "sound") {
130 $ns->sound ($v);
131
132 } elsif ($k eq "exp64") {
133 $setup{$k} = 1;
134
135 } elsif ($k eq "spellmon") {
136 $ns->monitor_spells ($v);
137
138 } elsif ($k eq "darkness") {
139 $ns->darkness ($v);
140
141 } elsif ($k eq "map1cmd") {
142 $ns->mapmode (cf::Map1Cmd) if $v > 0;
143
144 } elsif ($k eq "map1acmd") {
145 $ns->mapmode (cf::Map1aCmd) if $v > 0;
146
147 } elsif ($k eq "map2cmd") {
148 # gcfclient bug, map1acmd is sent too late
149 $ns->mapmode (cf::Map1aCmd);
150 $setup{$k} = "FALSE";
151
152 } elsif ($k eq "newmapcmd") {
153 $ns->newmapcmd ($v);
154
155 } elsif ($k eq "mapinfocmd") {
156 $ns->mapinfocmd ($v);
157
158 } elsif ($k eq "extcmd") {
159 $ns->extcmd ($v > 0);
160 send_capabilities $ns;
161
162 } elsif ($k eq "extmap") {
163 $ns->extmap ($v);
164
165 } elsif ($k eq "facecache") {
166 if (!$v) {
167 $v = 1;
168 $setup{$k} = $v;
169 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
170 }
171
172 $ns->facecache ($v);
173
174 } elsif ($k eq "faceset") {
175 $ns->faceset (0);
176 $setup{$k} = 0;
177 # $ns->image2 (1)
178
179 } elsif ($k eq "tileset") {
180 $setup{$k} = $ns->faceset ($v & 1);
181
182 } elsif ($k eq "itemcmd") {
183 # Version of the item protocol command to use. Currently,
184 # only supported versions are 1 and 2. Using a numeric
185 # value will make it very easy to extend this in the future.
186 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
187
188 $setup{$k} = $ns->itemcmd;
189
190 } elsif ($k eq "mapsize") {
191 my ($x, $y) = split /x/, $v;
192
193 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
194 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
195
196 $setup{$k} = "${x}x${y}";
197
198 } elsif ($k eq "extendedMapInfos") {
199 $ns->ext_mapinfos ($v);
200
201 } elsif ($k eq "extendedTextInfos") {
202 $ns->has_readable_type ($v);
203
204 } elsif ($k eq "smoothing") { # cfplus-style smoothing
205 $ns->smoothing ($v);
206
207 } elsif ($k eq "fxix") {
208 $ns->fxix ($v);
209
210 } elsif ($k eq "msg") {
211 $ns->can_msg ($v);
212
213 } elsif ($k eq "excmd") {
214 # we support it
215
216 } else {
217 # other commands:
218 # sexp: no idea, probably for oudated servers
219 # tick: more stupidity, server should send a tick per tick
220
221 $setup{$k} = "FALSE";
222 }
223 }
224
225 $ns->send_packet (join " ", setup => %setup);
226
227 cf::datalog setup =>
228 request => $args,
229 reply => \%setup,
230 client => $ns->version,
231 ;
232}
233
234sub addme {
235 my ($ns) = @_;
236
237 if (!$ns->facecache) 163 if (!$ns->facecache)
238 { 164 {
239 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 165 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
240 166
241 167
242*** 168***
243*** WARNING: 169*** WARNING:
244*** Your client does not support face/image caching, 170*** Your client does not support face/image caching,
245*** or it has been disabled. Face caching is mandatory 171*** or it has been disabled. Face caching is mandatory
246*** so please enable it or use a newer client. 172*** so please enable it or use a newer client.
247*** 173***
248*** Look at your client preferences: 174*** Look at your client preferences:
249*** 175***
250*** CFPlus: all known versions automatically enable the facecache. 176*** deliantra: all known versions automatically enable the facecache.
251*** cfclient: use the -cache commandline option. 177*** cfclient: use the -cache commandline option.
252*** cfclient: map will not redraw automatically (bug). 178*** cfclient: map will not redraw automatically (bug).
253*** gcfclient: use -cache commandline option, or enable 179*** gcfclient: use -cache commandline option, or enable
254*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 180*** gcfclient: Client => Configure => Map & Image => Cache Images.
255*** jcrossclient: your client is broken, use CFPlus or gcfclient. 181*** jcrossclient: your client is broken, use deliantra or gcfclient.
256*** 182***
257*** 183***
258EOF 184EOF
259 if ($ns->version =~ /jcrossclient/) { 185 if ($ns->version =~ /jcrossclient/) {
260 # let them, for now 186 # let them, for now
… …
280 } 206 }
281 207
282 $ns->pl and return $ns->destroy; 208 $ns->pl and return $ns->destroy;
283 209
284 $ns->async (sub { 210 $ns->async (sub {
211 $Coro::current->{desc} = "addme init";
212
285 my ($user, $pass); 213 my ($user, $pass);
286 214
287 $ns->send_packet ("addme_success"); 215 $ns->send_packet ("addme_success");
288 216
289 for (;;) { 217 for (;;) {
… …
294 cf::NDI_BLUE 222 cf::NDI_BLUE
295 ); 223 );
296 224
297 # read username 225 # read username
298 while () { 226 while () {
299 $user = query $ns, 0, "What is your name?\n:"; 227 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
300 228
301 if ($cf::LOGIN_LOCK{$user}) { 229 if ($cf::LOGIN_LOCK{$user}) {
302 $ns->send_drawinfo ( 230 $ns->send_drawinfo (
303 "That username is currently used in another login session. " 231 "That username is currently used in another login session. "
304 . "Chose another, or wait till the other session has ended.", 232 . "Chose another, or wait till the other session has ended.",
… …
312 . "(only a-z, A-Z and 0-9 are allowed), " 240 . "(only a-z, A-Z and 0-9 are allowed), "
313 . "or is not between 3 and 18 characters in length.", 241 . "or is not between 3 and 18 characters in length.",
314 cf::NDI_RED 242 cf::NDI_RED
315 ); 243 );
316 } 244 }
245 Coro::Timer::sleep 0.4;
317 } 246 }
318 247
319 check_playing $ns, $user and next; 248 check_playing $ns, $user and next;
249
250 $Coro::current->{desc} = "addme($user) pass";
320 251
321 $ns->send_drawinfo ( 252 $ns->send_drawinfo (
322 "Welcome $user, please enter your password now. " 253 "Welcome $user, please enter your password now. "
323 . "New users should now choose a password. " 254 . "New users should now choose a password. "
324 . "Anything your client lets you enter is fine.", 255 . "Anything your client lets you enter is fine.",
… …
332 $ns->send_drawinfo ( 263 $ns->send_drawinfo (
333 "Try to use at least three characters as your password please, " 264 "Try to use at least three characters as your password please, "
334 . "that cannot be too much to ask for :)", 265 . "that cannot be too much to ask for :)",
335 cf::NDI_RED 266 cf::NDI_RED
336 ); 267 );
268 Coro::Timer::sleep 0.4;
337 } 269 }
338 270
339 # lock this username for the remainder of this login session 271 # lock this username for the remainder of this login session
340 if ($cf::LOGIN_LOCK{$user}) { 272 if ($cf::LOGIN_LOCK{$user}) {
341 $ns->send_drawinfo ( 273 $ns->send_drawinfo (
… …
347 } 279 }
348 local $cf::LOGIN_LOCK{$user} = 1; 280 local $cf::LOGIN_LOCK{$user} = 1;
349 281
350 check_playing $ns, $user and next; 282 check_playing $ns, $user and next;
351 283
284 $Coro::current->{desc} = "addme($user) check";
285
352 # try to read the user file and check the password 286 # try to read the user file and check the password
353 if (my $pl = cf::player::find $user) { 287 if (my $pl = cf::player::find $user) {
354 aio_stat $pl->path and next; 288 aio_stat $pl->path and next;
355 my $mtime = (stat _)[9]; 289 my $mtime = (stat _)[9];
356 my $hash = $pl->password; 290 my $hash = $pl->password;
… …
358 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) {
359 nuke_str $pass; 293 nuke_str $pass;
360 # password matches, wonderful 294 # password matches, wonderful
361 my $pl = cf::player::find $user or next; 295 my $pl = cf::player::find $user or next;
362 $pl->connect ($ns); 296 $pl->connect ($ns);
297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
363 enter_map $pl; 298 enter_map $pl;
364 last; 299 last;
365 } elsif (can_cleanup $pl, $mtime) { 300 } elsif (can_cleanup $pl, $mtime) {
366 Coro::Timer::sleep 1; 301 Coro::Timer::sleep 1;
367 302
… …
409 next; 344 next;
410 } 345 }
411 } 346 }
412 347
413 # the rest of this function is character creation 348 # the rest of this function is character creation
349 $Coro::current->{desc} = "addme($user) chargen";
414 350
415 # just to make sure nothing is left over 351 # just to make sure nothing is left over
416 nuke_playerdir $user; 352 nuke_playerdir $user;
417 353
418 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.";
… …
422 nuke_str $pass2; 358 nuke_str $pass2;
423 $ns->send_drawinfo ( 359 $ns->send_drawinfo (
424 "The passwords do not match, please try again.", 360 "The passwords do not match, please try again.",
425 cf::NDI_RED 361 cf::NDI_RED
426 ); 362 );
363 Coro::Timer::sleep 0.5;
427 next; 364 next;
428 } 365 }
429 366
430 nuke_str $pass2; 367 nuke_str $pass2;
431 368
… …
453 $ob->swap_stats ($res - 1, $swap - 1); 390 $ob->swap_stats ($res - 1, $swap - 1);
454 } 391 }
455 } else { 392 } else {
456 $ob->roll_stats; 393 $ob->roll_stats;
457 } 394 }
395
396 Coro::Timer::sleep 0.05;
458 } 397 }
459 398
460 $ob->set_animation (2); 399 $ob->set_animation (2);
461 $ob->add_statbonus; 400 $ob->add_statbonus;
462 401
463 while () { 402 while () {
464 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 403 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
465 my $msg = $ob->msg; 404 my $msg = $ob->msg;
466 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 405 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
467 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 406 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
468 407
469 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 408 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
470 "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";
471 410
472 last if $res =~ /[dD]/; 411 last if $res =~ /[dD]/;
473 412
474 $pl->chargen_race_next; 413 $pl->chargen_race_next;
414 Coro::Timer::sleep 0.2;
475 } 415 }
476 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;
477 $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!");
478 437
479 delete $pl->{deny_save}; 438 delete $pl->{deny_save};
480 439
481 last; 440 last;
482 } 441 }
483 }); 442 });
484} 443});
485 444
486cf::register_command quit => sub { 445cf::register_command quit => sub {
487 my ($ob, $arg) = @_; 446 my ($ob, $arg) = @_;
488 447
489 $ob->reply (undef, 448 $ob->reply (undef,
… …
523 482
524 # update respawn position 483 # update respawn position
525 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 484 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
526 cf::async { $pl->save }; 485 cf::async { $pl->save };
527 486
528 $pl->killer ("left"); 487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
529 $ob->check_score; 488 $ob->check_score;
530 489
531 $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.");
532 491
533 $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 {
… …
555 514
556 if ($cleanly) { 515 if ($cleanly) {
557 $_->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;
558 } else { 517 } else {
559 $_->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;
560 $pl->{unclean_save} = $cf::RUNTIME; 519 $pl->{unclean_save} = $cf::RUNTIME
520 unless safe_spot $pl;
561 } 521 }
562 }, 522 },
563); 523);
564 524
565cf::client->attach (
566 on_addme => \&addme,
567 on_setup => \&setup,
568);
569
570############################################################################# 525#############################################################################
571 526
572our $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
573our $SAVE_TIMEOUT = 20; # save players every n seconds 528our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
574 529
575our $SCHEDULER = cf::async_ext { 530our $SCHEDULER = cf::async_ext {
576 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 531 $Coro::current->{desc} = "player scheduler";
532
577 while () { 533 while () {
578 $schedule_interval->next; 534 Coro::EV::timer_once $SCHEDULE_INTERVAL;
579 535
580 # this weird form of iteration over values is used because 536 # this weird form of iteration over values is used because
581 # the hash changes underneath us frequently, and for 537 # the hash changes underneath us frequently, and for
582 # 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)
583 # keeping a reference, so this is prone to crashes or worse. 539 # keeping a reference, so this is prone to crashes or worse.
… …
587 or next; 543 or next;
588 $pl->valid or next; 544 $pl->valid or next;
589 545
590 eval { 546 eval {
591 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 547 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
592 cf::wait_for_tick_begin;
593 $pl->save; 548 $pl->save;
594 549
595 unless ($pl->active) { 550 unless ($pl->active || $pl->ns) {
596 # 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
597 my $ob = $pl->ob; 552 my $ob = $pl->ob;
598 Scalar::Util::weaken $pl; 553
599 Scalar::Util::weaken $ob;
600 my $a_ = $pl->refcnt;#d#
601 my $b_ = $ob->refcnt;#d#
602 my $pl_ref = $pl->refcnt_cnt; 554 my $pl_ref = $pl->refcnt_cnt;
603 my $ob_ref = $ob->refcnt_cnt; 555 my $ob_ref = $ob->refcnt_cnt;
604 556
605 ## pl_ref == one from object + one from cf::PLAYER 557 ## pl_ref == $pl + ob->contr + %cf::PLAYER
606 ## ob_ref == one from simply being an object 558 ## ob_ref == $ob + pl->observe + simply being an object
607 if ($pl_ref == 2 && $ob_ref == 1) { 559 if ($pl_ref == 3 && $ob_ref == 3) {
608 warn "player-scheduler destroy ", $ob->name;#d# 560 warn "player-scheduler destroy ", $ob->name;#d#
609 561
610 # remove from sight and get fresh "copies" 562 # remove from sight and get fresh "copies"
611 $pl = delete $cf::PLAYER{$ob->name}; 563 $pl = delete $cf::PLAYER{$ob->name};
612 $ob = $pl->ob; 564 $ob = $pl->ob;
613 565
614 $ob->destroy;
615 $pl->destroy; 566 $pl->destroy; # destroys $ob
616 } else { 567 } else {
568 my $a_ = $pl->refcnt;#d#
569 my $b_ = $ob->refcnt;#d#
570
617 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#
618 } 572 }
619 } 573 }
620 } 574 }
621 }; 575 };
622 warn $@ if $@; 576 warn $@ if $@;
623 Coro::cede; 577 cf::cede_to_tick;
624 }; 578 };
625 } 579 }
626}; 580};
627 581
628$SCHEDULER->prio (1); 582$SCHEDULER->prio (1);

Diff Legend

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