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.99 by root, Mon Jun 29 06:11:01 2009 UTC vs.
Revision 1.127 by root, Sat Nov 17 12:00:31 2012 UTC

1#! perl # mandatory 1#! perl # mandatory depends=highscore
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 {
73 my ($pl) = @_; 70 my ($pl) = @_;
74 71
75 warn $pl->ob->name, ": enter map 1\n";#d#
76 my $ob = $pl->ob; 72 my $ob = $pl->ob;
77 73
78 my ($map, $x, $y) 74 my ($map, $x, $y)
79 = $ob->{_link_pos} 75 = $ob->{_link_pos}
80 ? @{delete $ob->{_link_pos}} 76 ? @{delete $ob->{_link_pos}}
81 : ($pl->maplevel, $ob->x, $ob->y); 77 : ($pl->maplevel, $ob->x, $ob->y);
82 78
83 warn $pl->ob->name, ": enter map 2\n";#d#
84 $ob->enter_link; 79 $ob->enter_link;
85 warn $pl->ob->name, ": enter map 3\n";#d#
86 80
87 my $m = cf::map::find $map; 81 my $m = cf::map::find $map;
88 my $time = delete $pl->{unclean_save}; 82 my $time = delete $pl->{unclean_save};
89 warn $pl->ob->name, ": enter map 4\n";#d#
90 83
91 if ($time && $m) { 84 if ($time && $m) {
92 if ($time < $m->{instantiate_time}) { 85 if ($time < $m->{instantiate_time}) {
93 # the map was reset in the meantime 86 # the map was reset in the meantime
94 my $age = $cf::RUNTIME - $time; 87 my $age = $cf::RUNTIME - $time;
95 88
96 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 89 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
97 90
98 if ($age >= $MAX_DISCONNECT_TIME) { 91 if ($age >= $MAX_DISCONNECT_TIME) {
99 $ob->message ( 92 $ob->message (
100 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 93 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
101 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. " 94 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
… …
127 cf::NDI_RED 120 cf::NDI_RED
128 ); 121 );
129 } 122 }
130 } 123 }
131 124
132 warn $pl->ob->name, ": enter map 5\n";#d#
133 #$ob->goto ($map, $x, $y); 125 $ob->goto ($map, $x, $y);
134 $ob->goto ($map, $x, $y, sub { 126}
135 warn $pl->ob->name, ": enter map check\n";#d# 127
136 $_[0] 128sub encode_password($) {
137 }, sub { 129 unpack "H*", Deliantra::Util::hash_pw $_[0]
138 warn $pl->ob->name, ": enter map done\n";#d# 130}
131
132sub compare_password($$) {
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;
139 }); 141 }
140 warn $pl->ob->name, ": enter map 6\n";#d#
141
142} 142}
143 143
144# delete a player directory, be non-blocking AND synchronous... 144# delete a player directory
145# (that's hard, so we crap out and fork).
146sub nuke_playerdir { 145sub nuke_playerdir {
147 my ($user) = @_; 146 my ($user) = @_;
148 147
148 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
149
149 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 150 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
150
151 cf::fork_call {
152 rename "$PLAYERDIR/$user", $temp; 151 aio_rename "$PLAYERDIR/$user", $temp;
153 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";
154 }; 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;
155} 277}
156 278
157cf::client->attach (on_addme => sub { 279cf::client->attach (on_addme => sub {
158 my ($ns) = @_; 280 my ($ns) = @_;
159 281
160 $ns->pl and return $ns->destroy; 282 $ns->{addme}++ and return $ns->destroy;
161 283
162 $ns->async (sub { 284 $ns->async (sub {
163 $Coro::current->{desc} = "addme init"; 285 $Coro::current->{desc} = "addme init";
164 286
165 my ($user, $pass); 287 my ($user, $pass);
… …
182 $ns->send_drawinfo ( 304 $ns->send_drawinfo (
183 "That username is currently used in another login session. " 305 "That username is currently used in another login session. "
184 . "Chose another, or wait till the other session has ended.", 306 . "Chose another, or wait till the other session has ended.",
185 cf::NDI_RED 307 cf::NDI_RED
186 ); 308 );
187 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) { 309 } elsif ($user =~ $VALID_LOGIN) {
188 last; 310 last;
189 } else { 311 } else {
190 $ns->send_drawinfo ( 312 $ns->send_drawinfo (
191 "Your username contains illegal characters " 313 "Your username contains illegal characters "
192 . "(only a-z, A-Z and 0-9 are allowed), " 314 . "(only a-z, A-Z and 0-9 are allowed), "
… …
237 359
238 # try to read the user file and check the password 360 # try to read the user file and check the password
239 if (my $pl = cf::player::find $user) { 361 if (my $pl = cf::player::find $user) {
240 aio_stat $pl->path and next; 362 aio_stat $pl->path and next;
241 my $mtime = (stat _)[9]; 363 my $mtime = (stat _)[9];
242 my $hash = $pl->password; 364 my $token = $pl->password;
243 365
244 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 366 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
245 nuke_str $pass; 367 # player exists and passwords match - we can proceed
368
246 # password matches, wonderful 369 # password matches, wonderful
247 my $pl = cf::player::find $user or next; 370 my $pl = cf::player::find $user or next;
248 $pl->connect ($ns); 371 $pl->connect ($ns);
249 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
250 enter_map $pl; 372 enter_map $pl;
373 login $pl;
251 last; 374 return;
252 } elsif (can_cleanup $pl, $mtime) { 375 } elsif (can_cleanup $pl, $mtime) {
253 Coro::Timer::sleep 1; 376 Coro::Timer::sleep 1;
254 377
255 $ns->send_drawinfo ( 378 $ns->send_drawinfo (
256 "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, "
257 . "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 "
258 . "because it has not been in-use for some time.", 381 . "because it has not been in-use for some time.",
259 cf::NDI_RED 382 cf::NDI_RED
260 ); 383 );
261 384
262 #TODO: nuke_str
263 (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]/
264 or next; 386 or next;
265 387
266 # check if the file hasn't changed 388 # check if the file hasn't changed
267 aio_stat cf::player::path $user and next; 389 aio_stat cf::player::path $user and next;
… …
269 391
270 $pl->quit_character; 392 $pl->quit_character;
271 393
272 # fall through to creation 394 # fall through to creation
273 } else { 395 } else {
274 nuke_str $pass;
275
276 Coro::Timer::sleep 1; 396 Coro::Timer::sleep 1;
277 397
278 $ns->send_drawinfo ( 398 $ns->send_drawinfo (
279 "Wrong username or password. Please try again " 399 "Wrong username or password. Please try again "
280 . "(check for Numlock and other semi-obvious error sources).", 400 . "(check for Numlock and other semi-obvious error sources).",
… …
282 ); 402 );
283 next; 403 next;
284 } 404 }
285 } else { 405 } else {
286 # unable to load the playerfile: 406 # unable to load the playerfile:
287 # 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
288 # something very similar. 408 # something very similar.
289 if (!aio_stat cf::player::playerdir $user) { 409 if (!aio_stat cf::player::playerdir $user) {
290 $ns->send_drawinfo ( 410 $ns->send_drawinfo (
291 "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. "
292 . "If this is your account, ask a dungeon master for assistance. " 412 . "If this is your account, ask a dungeon master for assistance. "
… …
295 ); 415 );
296 next; 416 next;
297 } 417 }
298 } 418 }
299 419
300 # the rest of this function is character creation
301 $Coro::current->{desc} = "addme($user) chargen";
302
303 # just to make sure nothing is left over
304 nuke_playerdir $user;
305
306 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.";
307 421
308 if ($pass2 ne $pass) { 422 if ($pass2 ne $pass) {
309 nuke_str $pass;
310 nuke_str $pass2;
311 $ns->send_drawinfo ( 423 $ns->send_drawinfo (
312 "The passwords do not match, please try again.", 424 "The passwords do not match, please try again.",
313 cf::NDI_RED 425 cf::NDI_RED
314 ); 426 );
315 Coro::Timer::sleep 0.5; 427 Coro::Timer::sleep 0.5;
316 next; 428 next;
317 } 429 }
318 430
319 nuke_str $pass2;
320
321 my $pl = cf::player::new $user;
322 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
323 nuke_str $pass;
324 $pl->connect ($ns);
325 my $ob = $pl->ob;
326
327 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
328
329 while () {
330 $ob->update_stats;
331 $pl->save_stats;
332
333 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
334 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
335
336 if ($res =~ /^[Nn]/) {
337 last;
338 } elsif ($res > 0 && $res <= 7) {
339 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
340
341 if ($swap > 0 && $swap <= 7) {
342 $ob->swap_stats ($res - 1, $swap - 1);
343 }
344 } else {
345 $ob->roll_stats;
346 }
347
348 Coro::Timer::sleep 0.05;
349 }
350
351 $ob->set_animation (2);
352 $ob->add_statbonus;
353
354 while () {
355 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
356 my $msg = $ob->msg;
357 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
358 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
359
360 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
361 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
362
363 last if $res =~ /[dD]/;
364
365 $pl->chargen_race_next;
366 Coro::Timer::sleep 0.2;
367 }
368
369 # create the playerdir, if necessary, as chargen_race_done did it before
370 # presumably because of unique maps
371 aio_mkdir playerdir $pl, 0770;
372 $pl->chargen_race_done;
373
374 while () {
375 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
376 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
377
378 if ($res =~ /^[fF]/) {
379 $pl->gender (1);
380 last;
381 } elsif ($res =~ /^[mM]/) {
382 $pl->gender (0);
383 last;
384 }
385 Coro::Timer::sleep 0.2;
386 }
387
388 $ob->reply (undef, "Welcome to Deliantra!");
389
390 # XXX: Workaround for delayed client ext protocol handshake
391 $pl->esrv_new_player;
392
393 delete $pl->{deny_save};
394
395 last; 431 last;
396 } 432 }
433
434 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
397 }); 435 });
398}); 436});
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
530cf::register_command password => sub {
531 my ($pl, $arg) = @_;
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
545 my (@args) = split /\s+/, $arg;
546 my ($player, $new_pw) = @args;
547
548 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
549 $pl->message (
550 "Usage: password <player> [<new password>]",
551 cf::NDI_UNIQUE | cf::NDI_REPLY);
552 return;
553 }
554
555 if ($new_pw eq '') {
556 $new_pw =
557 join '',
558 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
559 1..9;
560 }
561
562 cf::async {
563 my $plc = cf::player::find $player;
564 if ($plc) {
565 $plc->password (encode_password $new_pw);
566 $pl->message (
567 "Ok, changed password of '$player' to '$new_pw'!",
568 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
569 } else {
570 $pl->message (
571 "Fail! Couldn't set password for '$player', "
572 . "he doesn't seem to exist!",
573 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
574 }
575 };
576};
399 577
400cf::register_command quit => sub { 578cf::register_command quit => sub {
401 my ($ob, $arg) = @_; 579 my ($ob, $arg) = @_;
402 580
403 $ob->send_msg (undef, 581 $ob->send_msg (undef,
… …
414 $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 {
415 if ($_[0] !~ /^[yY]/) { 593 if ($_[0] !~ /^[yY]/) {
416 $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);
417 } else { 595 } else {
418 $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);
419 $pl->ns->flush; 597 cf::async {
420 cf::async { $pl->quit_character }; 598 $pl->quit_character;
599 };
421 } 600 }
422 }); 601 });
423}; 602};
424 603
425cf::object->attach ( 604cf::object->attach (
… …
431 610
432 my $pl = $ob->contr; 611 my $pl = $ob->contr;
433 612
434 # update respawn position 613 # update respawn position
435 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 614 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
436 cf::async { $pl->save };
437 615
616 cf::async {
438 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;
439 $ob->check_score; 618 ext::highscore::check $ob;
440 619
620 $pl->save;
621
441 $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);
442 623
624 my $ns = $pl->ns
625 or return;
626
443 $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 {
444 if ($_[0] !~ /^[yY]/) { 628 if ($_[0] !~ /^[yY]/) {
445 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 629 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
446 $pl->deactivate; 630 $pl->deactivate;
447 $pl->ns->destroy; 631 $pl->ns->destroy;
448 } else { 632 }
449 cf::async { $pl->save };
450 } 633 });
451 }); 634 };
452 }, 635 },
453); 636);
454 637
455cf::player->attach ( 638cf::player->attach (
456 on_login => sub { 639 on_login => sub {
… …
471 unless safe_spot $pl; 654 unless safe_spot $pl;
472 } 655 }
473 }, 656 },
474); 657);
475 658
476

Diff Legend

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