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.109 by root, Tue May 4 21:45:42 2010 UTC vs.
Revision 1.127 by root, Sat Nov 17 12:00:31 2012 UTC

… …
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use Deliantra::Util ();
7 8
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600; 9CONF MAX_DISCONNECT_TIME = 3600;
9 10
10# paranoia function to overwrite a string-in-place 11our $VALID_LOGIN = qr<^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z>;
11sub nuke_str {
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
13}
14 12
15sub query { 13sub query {
16 my ($ns, $flags, $text) = @_; 14 my ($ns, $flags, $text) = @_;
17 15
18 $ns->query ($flags, $text, Coro::rouse_cb); 16 $ns->query ($flags, $text, Coro::rouse_cb);
… …
59 my $m = $ob->map 57 my $m = $ob->map
60 or return; 58 or return;
61 my $x = $ob->x; 59 my $x = $ob->x;
62 my $y = $ob->y; 60 my $y = $ob->y;
63 61
64# return 0;#d# 62 # never happens normally, but helps when shell users make mistakes
65# warn join ":", $m->at ($x, $y);#d# 63 $m->linkable
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 64 or return 1;
67# return 0;
68 65
69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 66 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70} 67}
71 68
72sub enter_map { 69sub enter_map {
… …
126 } 123 }
127 124
128 $ob->goto ($map, $x, $y); 125 $ob->goto ($map, $x, $y);
129} 126}
130 127
131sub encode_password { 128sub encode_password($) {
132 crypt $_[0], 129 unpack "H*", Deliantra::Util::hash_pw $_[0]
133 join '',
134 ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
135} 130}
136 131
137# delete a player directory, be non-blocking AND synchronous... 132sub compare_password($$) {
138# (that's hard, so we crap out and fork). 133 my ($pass, $token) = @_;
134
135 if ($token =~ /!!(.*)/) {
136 return +(substr $pass, 0, 8) eq pack "H*", $1;
137 } elsif ($token =~ /!(.*)/) {
138 return $pass eq pack "H*", $1;
139 } else {
140 return $token eq crypt $pass, $token;
141 }
142}
143
144# delete a player directory
139sub nuke_playerdir { 145sub nuke_playerdir {
140 my ($user) = @_; 146 my ($user) = @_;
141 147
148 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
149
142 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 150 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
143
144 cf::fork_call {
145 rename "$PLAYERDIR/$user", $temp; 151 aio_rename "$PLAYERDIR/$user", $temp;
146 system "rm", "-rf", $temp; 152 IO::AIO::aio_rmtree $temp;
153}
154
155sub login {
156 my ($pl) = @_;
157
158 # handle character creation, if neccessary
159 # the rest of this function is character creation
160
161 my $ns = $pl->ns;
162 my $ob = $pl->ob;
163
164 $Coro::current->{desc} = "addme(" . $ob->name . ") login";
165
166 if ($pl->{chargen} eq "init") {
167 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
168
169 # create the playerdir, if necessary, as chargen_race_done did it before
170 # presumably because of unique maps
171 aio_mkdir playerdir $pl, 0770;
172 delete $pl->{deny_save}; # set by new
173 $pl->save;
174
175 $pl->{chargen} = "stats";
147 }; 176 }
177
178 if ($pl->{chargen} eq "stats") {
179 while () {
180 $ob->update_stats;
181 $pl->save_stats;
182
183 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
184 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
185
186 if ($res =~ /^[Nn]/) {
187 last;
188 } elsif ($res > 0 && $res <= 7) {
189 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
190
191 if ($swap > 0 && $swap <= 7) {
192 $ob->swap_stats ($res - 1, $swap - 1);
193 }
194 } else {
195 $ob->roll_stats;
196 }
197
198 Coro::Timer::sleep 0.05;
199 }
200
201 $ob->set_animation (2);
202 $ob->add_statbonus;
203
204 $pl->{chargen} = "race";
205 }
206
207 if ($pl->{chargen} eq "race") {
208 while () {
209 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
210 my $msg = $ob->msg;
211 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
212 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
213
214 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
215 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
216
217 last if $res =~ /[dD]/;
218
219 $pl->chargen_race_next;
220 Coro::Timer::sleep 0.05;
221 }
222
223 $pl->chargen_race_done;
224 $pl->{chargen} = "gender";
225 }
226
227 if ($pl->{chargen} eq "race") {
228 while () {
229 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
230 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
231
232 if ($res =~ /^[fF]/) {
233 $pl->gender (1);
234 last;
235 } elsif ($res =~ /^[mM]/) {
236 $pl->gender (0);
237 last;
238 }
239 Coro::Timer::sleep 0.05;
240 }
241 $pl->{chargen} = "done";
242 }
243
244 $ns->state (cf::ST_PLAYING);
245
246 if ($pl->{chargen} eq "done") {
247 # XXX: Workaround for delayed client ext protocol handshake
248 $pl->esrv_new_player;
249
250 $pl->{chargen} = "done";
251 }
252
253 $ob->reply (undef, "Welcome to Deliantra!");
254
255 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
256 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
257 }
258}
259
260sub chargen {
261 my ($ns, $user, $hash) = @_;
262
263 # lock again, too lazy to make this nicer
264 local $cf::LOGIN_LOCK{$user} = 1;
265
266 # just to make sure nothing is left over
267 # normally, nothing is there.
268 nuke_playerdir $user;
269
270 my $pl = cf::player::new $user;
271 $pl->password (unpack "H*", $hash);
272 $pl->connect ($ns);
273
274 $pl->{chargen} = "init";
275
276 login $pl;
148} 277}
149 278
150cf::client->attach (on_addme => sub { 279cf::client->attach (on_addme => sub {
151 my ($ns) = @_; 280 my ($ns) = @_;
152 281
153 $ns->pl and return $ns->destroy; 282 $ns->{addme}++ and return $ns->destroy;
154 283
155 $ns->async (sub { 284 $ns->async (sub {
156 $Coro::current->{desc} = "addme init"; 285 $Coro::current->{desc} = "addme init";
157 286
158 my ($user, $pass); 287 my ($user, $pass);
… …
175 $ns->send_drawinfo ( 304 $ns->send_drawinfo (
176 "That username is currently used in another login session. " 305 "That username is currently used in another login session. "
177 . "Chose another, or wait till the other session has ended.", 306 . "Chose another, or wait till the other session has ended.",
178 cf::NDI_RED 307 cf::NDI_RED
179 ); 308 );
180 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) { 309 } elsif ($user =~ $VALID_LOGIN) {
181 last; 310 last;
182 } else { 311 } else {
183 $ns->send_drawinfo ( 312 $ns->send_drawinfo (
184 "Your username contains illegal characters " 313 "Your username contains illegal characters "
185 . "(only a-z, A-Z and 0-9 are allowed), " 314 . "(only a-z, A-Z and 0-9 are allowed), "
… …
230 359
231 # try to read the user file and check the password 360 # try to read the user file and check the password
232 if (my $pl = cf::player::find $user) { 361 if (my $pl = cf::player::find $user) {
233 aio_stat $pl->path and next; 362 aio_stat $pl->path and next;
234 my $mtime = (stat _)[9]; 363 my $mtime = (stat _)[9];
235 my $hash = $pl->password; 364 my $token = $pl->password;
236 365
237 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 366 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
238 nuke_str $pass; 367 # player exists and passwords match - we can proceed
368
239 # password matches, wonderful 369 # password matches, wonderful
240 my $pl = cf::player::find $user or next; 370 my $pl = cf::player::find $user or next;
241 $pl->connect ($ns); 371 $pl->connect ($ns);
242 enter_map $pl; 372 enter_map $pl;
373 login $pl;
243 last; 374 return;
244 } elsif (can_cleanup $pl, $mtime) { 375 } elsif (can_cleanup $pl, $mtime) {
245 Coro::Timer::sleep 1; 376 Coro::Timer::sleep 1;
246 377
247 $ns->send_drawinfo ( 378 $ns->send_drawinfo (
248 "Player exists, but password does not match. If this is your account, " 379 "Player exists, but password does not match. If this is your account, "
249 . "please try again. If not, you can now decide to take over this account " 380 . "please try again. If not, you can now decide to take over this account "
250 . "because it has not been in-use for some time.", 381 . "because it has not been in-use for some time.",
251 cf::NDI_RED 382 cf::NDI_RED
252 ); 383 );
253 384
254 #TODO: nuke_str
255 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/ 385 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
256 or next; 386 or next;
257 387
258 # check if the file hasn't changed 388 # check if the file hasn't changed
259 aio_stat cf::player::path $user and next; 389 aio_stat cf::player::path $user and next;
… …
261 391
262 $pl->quit_character; 392 $pl->quit_character;
263 393
264 # fall through to creation 394 # fall through to creation
265 } else { 395 } else {
266 nuke_str $pass;
267
268 Coro::Timer::sleep 1; 396 Coro::Timer::sleep 1;
269 397
270 $ns->send_drawinfo ( 398 $ns->send_drawinfo (
271 "Wrong username or password. Please try again " 399 "Wrong username or password. Please try again "
272 . "(check for Numlock and other semi-obvious error sources).", 400 . "(check for Numlock and other semi-obvious error sources).",
… …
274 ); 402 );
275 next; 403 next;
276 } 404 }
277 } else { 405 } else {
278 # unable to load the playerfile: 406 # unable to load the playerfile:
279 # check wether the player dir exists, which means the file is corrupted or 407 # check whether the player dir exists, which means the file is corrupted or
280 # something very similar. 408 # something very similar.
281 if (!aio_stat cf::player::playerdir $user) { 409 if (!aio_stat cf::player::playerdir $user) {
282 $ns->send_drawinfo ( 410 $ns->send_drawinfo (
283 "Unable to retrieve this player. It might be a locked or broken account. " 411 "Unable to retrieve this player. It might be a locked or broken account. "
284 . "If this is your account, ask a dungeon master for assistance. " 412 . "If this is your account, ask a dungeon master for assistance. "
… …
287 ); 415 );
288 next; 416 next;
289 } 417 }
290 } 418 }
291 419
292 # the rest of this function is character creation
293 $Coro::current->{desc} = "addme($user) chargen";
294
295 # just to make sure nothing is left over
296 nuke_playerdir $user;
297
298 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 420 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
299 421
300 if ($pass2 ne $pass) { 422 if ($pass2 ne $pass) {
301 nuke_str $pass;
302 nuke_str $pass2;
303 $ns->send_drawinfo ( 423 $ns->send_drawinfo (
304 "The passwords do not match, please try again.", 424 "The passwords do not match, please try again.",
305 cf::NDI_RED 425 cf::NDI_RED
306 ); 426 );
307 Coro::Timer::sleep 0.5; 427 Coro::Timer::sleep 0.5;
308 next; 428 next;
309 } 429 }
310 430
311 nuke_str $pass2;
312
313 my $pl = cf::player::new $user;
314 $pl->password (encode_password $pass);
315 nuke_str $pass;
316 $pl->connect ($ns);
317 my $ob = $pl->ob;
318
319 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
320
321 while () {
322 $ob->update_stats;
323 $pl->save_stats;
324
325 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
326 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
327
328 if ($res =~ /^[Nn]/) {
329 last;
330 } elsif ($res > 0 && $res <= 7) {
331 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
332
333 if ($swap > 0 && $swap <= 7) {
334 $ob->swap_stats ($res - 1, $swap - 1);
335 }
336 } else {
337 $ob->roll_stats;
338 }
339
340 Coro::Timer::sleep 0.05;
341 }
342
343 $ob->set_animation (2);
344 $ob->add_statbonus;
345
346 while () {
347 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
348 my $msg = $ob->msg;
349 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
350 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
351
352 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
353 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
354
355 last if $res =~ /[dD]/;
356
357 $pl->chargen_race_next;
358 Coro::Timer::sleep 0.05;
359 }
360
361 # create the playerdir, if necessary, as chargen_race_done did it before
362 # presumably because of unique maps
363 aio_mkdir playerdir $pl, 0770;
364 $pl->chargen_race_done;
365
366 while () {
367 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
368 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
369
370 if ($res =~ /^[fF]/) {
371 $pl->gender (1);
372 last;
373 } elsif ($res =~ /^[mM]/) {
374 $pl->gender (0);
375 last;
376 }
377 Coro::Timer::sleep 0.05;
378 }
379
380 $ob->reply (undef, "Welcome to Deliantra!");
381
382 # XXX: Workaround for delayed client ext protocol handshake
383 $pl->esrv_new_player;
384
385 delete $pl->{deny_save};
386
387 last; 431 last;
388 } 432 }
389 433
390 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 434 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
391 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
392 }
393 }); 435 });
394}); 436});
395 437
438cf::client->attach (
439 on_version => sub {
440 my ($ns, $arg) = @_;
441
442 # perl probably uses lrand48, which is not secure at all
443 # maybe require linux and use /dev/urandom.
444 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
445 $ns->ext_msg (nonces => @{ $ns->{nonces} });
446 },
447);
448
449cf::register_async_exticmd create_login => sub {
450 my ($ns, $reply, $user, $pass) = @_;
451
452 $ns->{addme}++ and return $ns->destroy;
453
454 $ns->async (sub {
455 my $fail = sub {
456 $reply->(0, $_[0]);
457 $ns->flush; # does not ensure that the data reaches the client - TODO
458 # need to do this in another thread, as this one gets canceled
459 Coro::async_pool {
460 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
461 $ns->destroy if $ns->valid;
462 };
463 Coro::schedule; # do the destroy, should not return
464 };
465
466 $user =~ $VALID_LOGIN
467 or return $fail (
468 "Your username contains illegal characters (only a-z, A-Z and 0-9 are allowed), "
469 . "or is not between 3 and 20 characters in length."
470 );
471
472 cf::player::find $user
473 and return $fail->("User '$user' already exists - choose another login name.");
474
475 chargen $ns, $user, $pass;
476 });
477};
478
479cf::register_async_exticmd login => sub {
480 my ($ns, $reply, $user, $hash) = @_;
481
482 $ns->{addme}++ and return $ns->destroy;
483
484 $ns->async (sub {
485 local $cf::LOGIN_LOCK{$user} = 1;
486
487 $Coro::current->{desc} = "login($user) check";
488
489 my $fail = sub {
490 $reply->(0, $_[0]);
491 $ns->flush; # does not ensure that the data reaches the client - TODO
492 # need to do this in another thread, as this one gets canceled
493 Coro::async_pool {
494 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
495 $ns->destroy if $ns->valid;
496 };
497 Coro::schedule; # do the destroy, should not return
498 };
499
500 # try to read the user file and check the password
501 my $pl = cf::player::find $user
502 or return $fail->("User '$user' does not exist - wrong spelling?");
503
504 aio_stat $pl->path
505 and return $ns->destroy;
506
507 my $mtime = (stat _)[9];
508 my $token = $pl->password;
509
510 $token = $token =~ /^!/
511 ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
512 : pack "H*", $token;
513
514 $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
515
516 $token eq $hash
517 or $cf::CFG{ext_login_nocheck}
518 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
519
520 # player exists and passwords match - we can proceed
521
522 $reply->(1, "Success");
523
524 $pl->connect ($ns);
525 enter_map $pl;
526 login $pl;
527 });
528};
529
396cf::register_command password => sub { 530cf::register_command password => sub {
397 my ($pl, $arg) = @_; 531 my ($pl, $arg) = @_;
398 532
533 unless ($pl->flag (cf::FLAG_WIZ)) {
534 $pl->message (
535 "The password can currently only changed by a DM.",
536 cf::NDI_UNIQUE | cf::NDI_REPLY);
537 return;
538 }
539
540 $pl->message (#d#
541 "Passwords cannot currently be changed.",#d#
542 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
543 return;#d#
544
399 my (@args) = split /\s+/, $arg; 545 my (@args) = split /\s+/, $arg;
400
401 my ($new_pw, $player);
402
403 if ($pl->flag (cf::FLAG_WIZ)) {
404 ($player, $new_pw) = @args; 546 my ($player, $new_pw) = @args;
405 } else {
406 $new_pw = $args[0];
407 }
408 547
409 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') { 548 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
410 $pl->message ( 549 $pl->message (
411 "Usage: password <player> [<new password>]", 550 "Usage: password <player> [<new password>]",
412 cf::NDI_UNIQUE | cf::NDI_REPLY); 551 cf::NDI_UNIQUE | cf::NDI_REPLY);
413 return; 552 return;
414 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
415 $pl->message (
416 "Usage: password <new password>",
417 cf::NDI_UNIQUE | cf::NDI_REPLY);
418 return;
419 } 553 }
420 554
421 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
422 unless ($new_pw ne '') { 555 if ($new_pw eq '') {
423 $new_pw = 556 $new_pw =
424 join '', 557 join '',
425 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] } 558 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
426 1..9; 559 1..9;
427 } 560 }
428 561
429 cf::async { 562 cf::async {
430 my $plc = cf::player::find $player; 563 my $plc = cf::player::find $player;
431 if ($plc) { 564 if ($plc) {
432 $plc->password (encode_password $new_pw); 565 $plc->password (encode_password $new_pw);
433 $pl->message (
434 "Ok, changed password of '$player' to '$new_pw'!",
435 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
436 } else {
437 $pl->message (
438 "Fail! Couldn't set password for '$player', "
439 . "he doesn't seem to exist!",
440 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
441 }
442 };
443 } else {
444 my $change = delete $pl->{password_change};
445
446 if ($change && (time - $change->[0]) < 60) {
447 $pl->message ( 566 $pl->message (
448 "Ok, changed your password!", 567 "Ok, changed password of '$player' to '$new_pw'!",
449 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 568 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
450 $pl->contr->password (encode_password $new_pw);
451
452 } else { 569 } else {
453 $pl->message ( 570 $pl->message (
454 "Ok, please confirm your new password by sending " 571 "Fail! Couldn't set password for '$player', "
455 . "the command again within one minute!", 572 . "he doesn't seem to exist!",
456 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 573 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
457 $pl->{password_change} = [time, $new_pw];
458 } 574 }
459 } 575 };
460}; 576};
461 577
462cf::register_command quit => sub { 578cf::register_command quit => sub {
463 my ($ob, $arg) = @_; 579 my ($ob, $arg) = @_;
464 580
… …
476 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 592 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
477 if ($_[0] !~ /^[yY]/) { 593 if ($_[0] !~ /^[yY]/) {
478 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 594 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
479 } else { 595 } else {
480 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 596 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
481 $pl->ns->flush;
482 cf::async { 597 cf::async {
483 ext::highscore::check $pl->ob;
484 $pl->quit_character; 598 $pl->quit_character;
485 }; 599 };
486 } 600 }
487 }); 601 });
488}; 602};
… …
496 610
497 my $pl = $ob->contr; 611 my $pl = $ob->contr;
498 612
499 # update respawn position 613 # update respawn position
500 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 614 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
501 cf::async { $pl->save };
502 615
616 cf::async {
503 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 617 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
504 ext::highscore::check $ob; 618 ext::highscore::check $ob;
505 619
620 $pl->save;
621
506 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY); 622 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
507 623
624 my $ns = $pl->ns
625 or return;
626
508 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 627 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
509 if ($_[0] !~ /^[yY]/) { 628 if ($_[0] !~ /^[yY]/) {
510 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 629 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
511 $pl->deactivate; 630 $pl->deactivate;
512 $pl->ns->destroy; 631 $pl->ns->destroy;
513 } else { 632 }
514 cf::async { $pl->save };
515 } 633 });
516 }); 634 };
517 }, 635 },
518); 636);
519 637
520cf::player->attach ( 638cf::player->attach (
521 on_login => sub { 639 on_login => sub {

Diff Legend

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