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.110 by root, Sat May 8 10:49:44 2010 UTC vs.
Revision 1.126 by root, Sat Nov 17 11:13:54 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 {
… …
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],
133# join '',
134# ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
135 "!" . unpack "H*", $_[0] 129 "!" . unpack "H*", $_[0]
136} 130}
137 131
138sub compare_password($$) { 132sub compare_password($$) {
139 my ($pass, $token) = @_; 133 my ($pass, $token) = @_;
140 134
141 if ($token =~ /\!(.*)/) { 135 if ($token =~ /!!(.*)/) {
136 return +(substr $pass, 0, 8) eq pack "H*", $1;
137 } elsif ($token =~ /!(.*)/) {
142 return $pass eq pack "H*", $1; 138 return $pass eq pack "H*", $1;
143 } else { 139 } else {
144 return $token eq crypt $pass, $token; 140 return $token eq crypt $pass, $token;
145 } 141 }
146} 142}
147 143
148# delete a player directory, be non-blocking AND synchronous... 144# delete a player directory
149# (that's hard, so we crap out and fork).
150sub nuke_playerdir { 145sub nuke_playerdir {
151 my ($user) = @_; 146 my ($user) = @_;
152 147
148 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
149
153 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 150 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
154
155 cf::fork_call {
156 rename "$PLAYERDIR/$user", $temp; 151 aio_rename "$PLAYERDIR/$user", $temp;
157 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";
158 }; 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;
159} 278}
160 279
161cf::client->attach (on_addme => sub { 280cf::client->attach (on_addme => sub {
162 my ($ns) = @_; 281 my ($ns) = @_;
163 282
164 $ns->pl and return $ns->destroy; 283 $ns->{addme}++ and return $ns->destroy;
165 284
166 $ns->async (sub { 285 $ns->async (sub {
167 $Coro::current->{desc} = "addme init"; 286 $Coro::current->{desc} = "addme init";
168 287
169 my ($user, $pass); 288 my ($user, $pass);
… …
186 $ns->send_drawinfo ( 305 $ns->send_drawinfo (
187 "That username is currently used in another login session. " 306 "That username is currently used in another login session. "
188 . "Chose another, or wait till the other session has ended.", 307 . "Chose another, or wait till the other session has ended.",
189 cf::NDI_RED 308 cf::NDI_RED
190 ); 309 );
191 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) { 310 } elsif ($user =~ $VALID_LOGIN) {
192 last; 311 last;
193 } else { 312 } else {
194 $ns->send_drawinfo ( 313 $ns->send_drawinfo (
195 "Your username contains illegal characters " 314 "Your username contains illegal characters "
196 . "(only a-z, A-Z and 0-9 are allowed), " 315 . "(only a-z, A-Z and 0-9 are allowed), "
… …
244 aio_stat $pl->path and next; 363 aio_stat $pl->path and next;
245 my $mtime = (stat _)[9]; 364 my $mtime = (stat _)[9];
246 my $token = $pl->password; 365 my $token = $pl->password;
247 366
248 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) { 367 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
249 $pl->password (encode_password $pass); # make sure we store the new encoding #d# 368 # player exists and passwords match - we can proceed
250 nuke_str $pass; 369
251 # password matches, wonderful 370 # password matches, wonderful
252 my $pl = cf::player::find $user or next; 371 my $pl = cf::player::find $user or next;
253 $pl->connect ($ns); 372 $pl->connect ($ns);
254 enter_map $pl; 373 enter_map $pl;
374 login $pl;
255 last; 375 return;
256 } elsif (can_cleanup $pl, $mtime) { 376 } elsif (can_cleanup $pl, $mtime) {
257 Coro::Timer::sleep 1; 377 Coro::Timer::sleep 1;
258 378
259 $ns->send_drawinfo ( 379 $ns->send_drawinfo (
260 "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, "
261 . "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 "
262 . "because it has not been in-use for some time.", 382 . "because it has not been in-use for some time.",
263 cf::NDI_RED 383 cf::NDI_RED
264 ); 384 );
265 385
266 #TODO: nuke_str
267 (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]/
268 or next; 387 or next;
269 388
270 # check if the file hasn't changed 389 # check if the file hasn't changed
271 aio_stat cf::player::path $user and next; 390 aio_stat cf::player::path $user and next;
… …
273 392
274 $pl->quit_character; 393 $pl->quit_character;
275 394
276 # fall through to creation 395 # fall through to creation
277 } else { 396 } else {
278 nuke_str $pass;
279
280 Coro::Timer::sleep 1; 397 Coro::Timer::sleep 1;
281 398
282 $ns->send_drawinfo ( 399 $ns->send_drawinfo (
283 "Wrong username or password. Please try again " 400 "Wrong username or password. Please try again "
284 . "(check for Numlock and other semi-obvious error sources).", 401 . "(check for Numlock and other semi-obvious error sources).",
… …
286 ); 403 );
287 next; 404 next;
288 } 405 }
289 } else { 406 } else {
290 # unable to load the playerfile: 407 # unable to load the playerfile:
291 # 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
292 # something very similar. 409 # something very similar.
293 if (!aio_stat cf::player::playerdir $user) { 410 if (!aio_stat cf::player::playerdir $user) {
294 $ns->send_drawinfo ( 411 $ns->send_drawinfo (
295 "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. "
296 . "If this is your account, ask a dungeon master for assistance. " 413 . "If this is your account, ask a dungeon master for assistance. "
… …
299 ); 416 );
300 next; 417 next;
301 } 418 }
302 } 419 }
303 420
304 # the rest of this function is character creation
305 $Coro::current->{desc} = "addme($user) chargen";
306
307 # just to make sure nothing is left over
308 nuke_playerdir $user;
309
310 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.";
311 422
312 if ($pass2 ne $pass) { 423 if ($pass2 ne $pass) {
313 nuke_str $pass;
314 nuke_str $pass2;
315 $ns->send_drawinfo ( 424 $ns->send_drawinfo (
316 "The passwords do not match, please try again.", 425 "The passwords do not match, please try again.",
317 cf::NDI_RED 426 cf::NDI_RED
318 ); 427 );
319 Coro::Timer::sleep 0.5; 428 Coro::Timer::sleep 0.5;
320 next; 429 next;
321 } 430 }
322 431
323 nuke_str $pass2;
324
325 my $pl = cf::player::new $user;
326 $pl->password (encode_password $pass);
327 nuke_str $pass;
328 $pl->connect ($ns);
329 my $ob = $pl->ob;
330
331 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
332
333 while () {
334 $ob->update_stats;
335 $pl->save_stats;
336
337 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
338 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
339
340 if ($res =~ /^[Nn]/) {
341 last;
342 } elsif ($res > 0 && $res <= 7) {
343 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
344
345 if ($swap > 0 && $swap <= 7) {
346 $ob->swap_stats ($res - 1, $swap - 1);
347 }
348 } else {
349 $ob->roll_stats;
350 }
351
352 Coro::Timer::sleep 0.05;
353 }
354
355 $ob->set_animation (2);
356 $ob->add_statbonus;
357
358 while () {
359 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
360 my $msg = $ob->msg;
361 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
362 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
363
364 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
365 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
366
367 last if $res =~ /[dD]/;
368
369 $pl->chargen_race_next;
370 Coro::Timer::sleep 0.05;
371 }
372
373 # create the playerdir, if necessary, as chargen_race_done did it before
374 # presumably because of unique maps
375 aio_mkdir playerdir $pl, 0770;
376 $pl->chargen_race_done;
377
378 while () {
379 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
380 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
381
382 if ($res =~ /^[fF]/) {
383 $pl->gender (1);
384 last;
385 } elsif ($res =~ /^[mM]/) {
386 $pl->gender (0);
387 last;
388 }
389 Coro::Timer::sleep 0.05;
390 }
391
392 $ob->reply (undef, "Welcome to Deliantra!");
393
394 # XXX: Workaround for delayed client ext protocol handshake
395 $pl->esrv_new_player;
396
397 delete $pl->{deny_save};
398
399 last; 432 last;
400 } 433 }
401 434
402 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 435 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
403 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
404 }
405 }); 436 });
406}); 437});
407 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 if $ns->valid;
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 if $ns->valid;
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
408cf::register_command password => sub { 531cf::register_command password => sub {
409 my ($pl, $arg) = @_; 532 my ($pl, $arg) = @_;
410 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
411 my (@args) = split /\s+/, $arg; 546 my (@args) = split /\s+/, $arg;
412
413 my ($new_pw, $player);
414
415 if ($pl->flag (cf::FLAG_WIZ)) {
416 ($player, $new_pw) = @args; 547 my ($player, $new_pw) = @args;
417 } else {
418 $new_pw = $args[0];
419 }
420 548
421 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') { 549 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
422 $pl->message ( 550 $pl->message (
423 "Usage: password <player> [<new password>]", 551 "Usage: password <player> [<new password>]",
424 cf::NDI_UNIQUE | cf::NDI_REPLY); 552 cf::NDI_UNIQUE | cf::NDI_REPLY);
425 return; 553 return;
426 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
427 $pl->message (
428 "Usage: password <new password>",
429 cf::NDI_UNIQUE | cf::NDI_REPLY);
430 return;
431 } 554 }
432 555
433 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
434 unless ($new_pw ne '') { 556 if ($new_pw eq '') {
435 $new_pw = 557 $new_pw =
436 join '', 558 join '',
437 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] } 559 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
438 1..9; 560 1..9;
439 } 561 }
440 562
441 cf::async { 563 cf::async {
442 my $plc = cf::player::find $player; 564 my $plc = cf::player::find $player;
443 if ($plc) { 565 if ($plc) {
444 $plc->password (encode_password $new_pw); 566 $plc->password (encode_password $new_pw);
445 $pl->message (
446 "Ok, changed password of '$player' to '$new_pw'!",
447 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
448 } else {
449 $pl->message (
450 "Fail! Couldn't set password for '$player', "
451 . "he doesn't seem to exist!",
452 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
453 }
454 };
455 } else {
456 my $change = delete $pl->{password_change};
457
458 if ($change && (time - $change->[0]) < 60) {
459 $pl->message ( 567 $pl->message (
460 "Ok, changed your password!", 568 "Ok, changed password of '$player' to '$new_pw'!",
461 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 569 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
462 $pl->contr->password (encode_password $new_pw);
463
464 } else { 570 } else {
465 $pl->message ( 571 $pl->message (
466 "Ok, please confirm your new password by sending " 572 "Fail! Couldn't set password for '$player', "
467 . "the command again within one minute!", 573 . "he doesn't seem to exist!",
468 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 574 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
469 $pl->{password_change} = [time, $new_pw];
470 } 575 }
471 } 576 };
472}; 577};
473 578
474cf::register_command quit => sub { 579cf::register_command quit => sub {
475 my ($ob, $arg) = @_; 580 my ($ob, $arg) = @_;
476 581
… …
488 $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 {
489 if ($_[0] !~ /^[yY]/) { 594 if ($_[0] !~ /^[yY]/) {
490 $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);
491 } else { 596 } else {
492 $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);
493 $pl->ns->flush;
494 cf::async { 598 cf::async {
495 ext::highscore::check $pl->ob;
496 $pl->quit_character; 599 $pl->quit_character;
497 }; 600 };
498 } 601 }
499 }); 602 });
500}; 603};
… …
508 611
509 my $pl = $ob->contr; 612 my $pl = $ob->contr;
510 613
511 # update respawn position 614 # update respawn position
512 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 615 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
513 cf::async { $pl->save };
514 616
617 cf::async {
515 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;
516 ext::highscore::check $ob; 619 ext::highscore::check $ob;
517 620
621 $pl->save;
622
518 $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);
519 624
625 my $ns = $pl->ns
626 or return;
627
520 $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 {
521 if ($_[0] !~ /^[yY]/) { 629 if ($_[0] !~ /^[yY]/) {
522 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 630 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
523 $pl->deactivate; 631 $pl->deactivate;
524 $pl->ns->destroy; 632 $pl->ns->destroy;
525 } else { 633 }
526 cf::async { $pl->save };
527 } 634 });
528 }); 635 };
529 }, 636 },
530); 637);
531 638
532cf::player->attach ( 639cf::player->attach (
533 on_login => sub { 640 on_login => sub {

Diff Legend

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