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.105 by root, Wed Apr 28 11:28:21 2010 UTC vs.
Revision 1.128 by root, Sat Nov 17 12:02:43 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 {
… …
87 if ($time && $m) { 84 if ($time && $m) {
88 if ($time < $m->{instantiate_time}) { 85 if ($time < $m->{instantiate_time}) {
89 # the map was reset in the meantime 86 # the map was reset in the meantime
90 my $age = $cf::RUNTIME - $time; 87 my $age = $cf::RUNTIME - $time;
91 88
92 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#
93 90
94 if ($age >= $MAX_DISCONNECT_TIME) { 91 if ($age >= $MAX_DISCONNECT_TIME) {
95 $ob->message ( 92 $ob->message (
96 "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. "
97 . "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. "
… …
126 } 123 }
127 124
128 $ob->goto ($map, $x, $y); 125 $ob->goto ($map, $x, $y);
129} 126}
130 127
131# delete a player directory, be non-blocking AND synchronous... 128sub encode_password($) {
132# (that's hard, so we crap out and fork). 129 unpack "H*", Deliantra::Util::hash_pw $_[0]
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;
141 }
142}
143
144# delete a player directory
133sub nuke_playerdir { 145sub nuke_playerdir {
134 my ($user) = @_; 146 my ($user) = @_;
135 147
148 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
149
136 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 150 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
137
138 cf::fork_call {
139 rename "$PLAYERDIR/$user", $temp; 151 aio_rename "$PLAYERDIR/$user", $temp;
140 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";
141 }; 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;
142} 277}
143 278
144cf::client->attach (on_addme => sub { 279cf::client->attach (on_addme => sub {
145 my ($ns) = @_; 280 my ($ns) = @_;
146 281
147 $ns->pl and return $ns->destroy; 282 $ns->{addme}++ and return $ns->destroy;
148 283
149 $ns->async (sub { 284 $ns->async (sub {
150 $Coro::current->{desc} = "addme init"; 285 $Coro::current->{desc} = "addme init";
151 286
152 my ($user, $pass); 287 my ($user, $pass);
… …
169 $ns->send_drawinfo ( 304 $ns->send_drawinfo (
170 "That username is currently used in another login session. " 305 "That username is currently used in another login session. "
171 . "Chose another, or wait till the other session has ended.", 306 . "Chose another, or wait till the other session has ended.",
172 cf::NDI_RED 307 cf::NDI_RED
173 ); 308 );
174 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) { 309 } elsif ($user =~ $VALID_LOGIN) {
175 last; 310 last;
176 } else { 311 } else {
177 $ns->send_drawinfo ( 312 $ns->send_drawinfo (
178 "Your username contains illegal characters " 313 "Your username contains illegal characters "
179 . "(only a-z, A-Z and 0-9 are allowed), " 314 . "(only a-z, A-Z and 0-9 are allowed), "
… …
224 359
225 # try to read the user file and check the password 360 # try to read the user file and check the password
226 if (my $pl = cf::player::find $user) { 361 if (my $pl = cf::player::find $user) {
227 aio_stat $pl->path and next; 362 aio_stat $pl->path and next;
228 my $mtime = (stat _)[9]; 363 my $mtime = (stat _)[9];
229 my $hash = $pl->password; 364 my $token = $pl->password;
230 365
231 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 366 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
232 nuke_str $pass; 367 # player exists and passwords match - we can proceed
368
233 # password matches, wonderful 369 # password matches, wonderful
234 my $pl = cf::player::find $user or next; 370 my $pl = cf::player::find $user or next;
235 $pl->connect ($ns); 371 $pl->connect ($ns);
236 enter_map $pl; 372 enter_map $pl;
373 login $pl;
237 last; 374 return;
238 } elsif (can_cleanup $pl, $mtime) { 375 } elsif (can_cleanup $pl, $mtime) {
239 Coro::Timer::sleep 1; 376 Coro::Timer::sleep 1;
240 377
241 $ns->send_drawinfo ( 378 $ns->send_drawinfo (
242 "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, "
243 . "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 "
244 . "because it has not been in-use for some time.", 381 . "because it has not been in-use for some time.",
245 cf::NDI_RED 382 cf::NDI_RED
246 ); 383 );
247 384
248 #TODO: nuke_str
249 (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]/
250 or next; 386 or next;
251 387
252 # check if the file hasn't changed 388 # check if the file hasn't changed
253 aio_stat cf::player::path $user and next; 389 aio_stat cf::player::path $user and next;
… …
255 391
256 $pl->quit_character; 392 $pl->quit_character;
257 393
258 # fall through to creation 394 # fall through to creation
259 } else { 395 } else {
260 nuke_str $pass;
261
262 Coro::Timer::sleep 1; 396 Coro::Timer::sleep 1;
263 397
264 $ns->send_drawinfo ( 398 $ns->send_drawinfo (
265 "Wrong username or password. Please try again " 399 "Wrong username or password. Please try again "
266 . "(check for Numlock and other semi-obvious error sources).", 400 . "(check for Numlock and other semi-obvious error sources).",
… …
268 ); 402 );
269 next; 403 next;
270 } 404 }
271 } else { 405 } else {
272 # unable to load the playerfile: 406 # unable to load the playerfile:
273 # 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
274 # something very similar. 408 # something very similar.
275 if (!aio_stat cf::player::playerdir $user) { 409 if (!aio_stat cf::player::playerdir $user) {
276 $ns->send_drawinfo ( 410 $ns->send_drawinfo (
277 "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. "
278 . "If this is your account, ask a dungeon master for assistance. " 412 . "If this is your account, ask a dungeon master for assistance. "
… …
281 ); 415 );
282 next; 416 next;
283 } 417 }
284 } 418 }
285 419
286 # the rest of this function is character creation
287 $Coro::current->{desc} = "addme($user) chargen";
288
289 # just to make sure nothing is left over
290 nuke_playerdir $user;
291
292 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.";
293 421
294 if ($pass2 ne $pass) { 422 if ($pass2 ne $pass) {
295 nuke_str $pass;
296 nuke_str $pass2;
297 $ns->send_drawinfo ( 423 $ns->send_drawinfo (
298 "The passwords do not match, please try again.", 424 "The passwords do not match, please try again.",
299 cf::NDI_RED 425 cf::NDI_RED
300 ); 426 );
301 Coro::Timer::sleep 0.5; 427 Coro::Timer::sleep 0.5;
302 next; 428 next;
303 } 429 }
304 430
305 nuke_str $pass2;
306
307 my $pl = cf::player::new $user;
308 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]);
309 nuke_str $pass;
310 $pl->connect ($ns);
311 my $ob = $pl->ob;
312
313 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
314
315 while () {
316 $ob->update_stats;
317 $pl->save_stats;
318
319 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
320 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
321
322 if ($res =~ /^[Nn]/) {
323 last;
324 } elsif ($res > 0 && $res <= 7) {
325 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
326
327 if ($swap > 0 && $swap <= 7) {
328 $ob->swap_stats ($res - 1, $swap - 1);
329 }
330 } else {
331 $ob->roll_stats;
332 }
333
334 Coro::Timer::sleep 0.05;
335 }
336
337 $ob->set_animation (2);
338 $ob->add_statbonus;
339
340 while () {
341 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
342 my $msg = $ob->msg;
343 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
344 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
345
346 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
347 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
348
349 last if $res =~ /[dD]/;
350
351 $pl->chargen_race_next;
352 Coro::Timer::sleep 0.05;
353 }
354
355 # create the playerdir, if necessary, as chargen_race_done did it before
356 # presumably because of unique maps
357 aio_mkdir playerdir $pl, 0770;
358 $pl->chargen_race_done;
359
360 while () {
361 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
362 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
363
364 if ($res =~ /^[fF]/) {
365 $pl->gender (1);
366 last;
367 } elsif ($res =~ /^[mM]/) {
368 $pl->gender (0);
369 last;
370 }
371 Coro::Timer::sleep 0.05;
372 }
373
374 $ob->reply (undef, "Welcome to Deliantra!");
375
376 # XXX: Workaround for delayed client ext protocol handshake
377 $pl->esrv_new_player;
378
379 delete $pl->{deny_save};
380
381 last; 431 last;
382 } 432 }
383 433
384 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 434 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
385 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
386 }
387 }); 435 });
388}); 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 $reply->(1, "Account Created");
476
477 chargen $ns, $user, $pass;
478 });
479};
480
481cf::register_async_exticmd login => sub {
482 my ($ns, $reply, $user, $hash) = @_;
483
484 $ns->{addme}++ and return $ns->destroy;
485
486 $ns->async (sub {
487 local $cf::LOGIN_LOCK{$user} = 1;
488
489 $Coro::current->{desc} = "login($user) check";
490
491 my $fail = sub {
492 $reply->(0, $_[0]);
493 $ns->flush; # does not ensure that the data reaches the client - TODO
494 # need to do this in another thread, as this one gets canceled
495 Coro::async_pool {
496 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
497 $ns->destroy if $ns->valid;
498 };
499 Coro::schedule; # do the destroy, should not return
500 };
501
502 # try to read the user file and check the password
503 my $pl = cf::player::find $user
504 or return $fail->("User '$user' does not exist - wrong spelling?");
505
506 aio_stat $pl->path
507 and return $ns->destroy;
508
509 my $mtime = (stat _)[9];
510 my $token = $pl->password;
511
512 $token = $token =~ /^!/
513 ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
514 : pack "H*", $token;
515
516 $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
517
518 $token eq $hash
519 or $cf::CFG{ext_login_nocheck}
520 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
521
522 # player exists and passwords match - we can proceed
523
524 $reply->(1, "Success");
525
526 $pl->connect ($ns);
527 enter_map $pl;
528 login $pl;
529 });
530};
531
532cf::register_command password => sub {
533 my ($pl, $arg) = @_;
534
535 unless ($pl->flag (cf::FLAG_WIZ)) {
536 $pl->message (
537 "The password can currently only changed by a DM.",
538 cf::NDI_UNIQUE | cf::NDI_REPLY);
539 return;
540 }
541
542 $pl->message (#d#
543 "Passwords cannot currently be changed.",#d#
544 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
545 return;#d#
546
547 my (@args) = split /\s+/, $arg;
548 my ($player, $new_pw) = @args;
549
550 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
551 $pl->message (
552 "Usage: password <player> [<new password>]",
553 cf::NDI_UNIQUE | cf::NDI_REPLY);
554 return;
555 }
556
557 if ($new_pw eq '') {
558 $new_pw =
559 join '',
560 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
561 1..9;
562 }
563
564 cf::async {
565 my $plc = cf::player::find $player;
566 if ($plc) {
567 $plc->password (encode_password $new_pw);
568 $pl->message (
569 "Ok, changed password of '$player' to '$new_pw'!",
570 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
571 } else {
572 $pl->message (
573 "Fail! Couldn't set password for '$player', "
574 . "he doesn't seem to exist!",
575 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
576 }
577 };
578};
389 579
390cf::register_command quit => sub { 580cf::register_command quit => sub {
391 my ($ob, $arg) = @_; 581 my ($ob, $arg) = @_;
392 582
393 $ob->send_msg (undef, 583 $ob->send_msg (undef,
… …
404 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 594 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
405 if ($_[0] !~ /^[yY]/) { 595 if ($_[0] !~ /^[yY]/) {
406 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 596 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
407 } else { 597 } else {
408 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 598 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
409 $pl->ns->flush;
410 cf::async { 599 cf::async {
411 ext::highscore::check $pl->ob;
412 $pl->quit_character; 600 $pl->quit_character;
413 }; 601 };
414 } 602 }
415 }); 603 });
416}; 604};
… …
424 612
425 my $pl = $ob->contr; 613 my $pl = $ob->contr;
426 614
427 # update respawn position 615 # update respawn position
428 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 616 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
429 cf::async { $pl->save };
430 617
618 cf::async {
431 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 619 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
432 ext::highscore::check $ob; 620 ext::highscore::check $ob;
433 621
622 $pl->save;
623
434 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY); 624 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
435 625
626 my $ns = $pl->ns
627 or return;
628
436 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 629 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
437 if ($_[0] !~ /^[yY]/) { 630 if ($_[0] !~ /^[yY]/) {
438 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 631 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
439 $pl->deactivate; 632 $pl->deactivate;
440 $pl->ns->destroy; 633 $pl->ns->destroy;
441 } else { 634 }
442 cf::async { $pl->save };
443 } 635 });
444 }); 636 };
445 }, 637 },
446); 638);
447 639
448cf::player->attach ( 640cf::player->attach (
449 on_login => sub { 641 on_login => sub {
… …
464 unless safe_spot $pl; 656 unless safe_spot $pl;
465 } 657 }
466 }, 658 },
467); 659);
468 660
469

Diff Legend

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