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

Diff Legend

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