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.90 by root, Tue Sep 16 16:03:02 2008 UTC vs.
Revision 1.124 by root, Sat Nov 17 06:41:16 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# paranoia function to overwrite a string-in-place
11sub nuke_str {
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
13}
14 10
15sub query { 11sub query {
16 my ($ns, $flags, $text) = @_; 12 my ($ns, $flags, $text) = @_;
17 13
18 my $current = $Coro::current; 14 $ns->query ($flags, $text, Coro::rouse_cb);
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 15 Coro::rouse_wait
20 Coro::schedule while ref $current;
21
22 $current
23} 16}
24 17
25sub can_cleanup { 18sub can_cleanup {
26 my ($pl, $mtime) = @_; 19 my ($pl, $mtime) = @_;
27 20
… …
62 my $m = $ob->map 55 my $m = $ob->map
63 or return; 56 or return;
64 my $x = $ob->x; 57 my $x = $ob->x;
65 my $y = $ob->y; 58 my $y = $ob->y;
66 59
67# return 0;#d# 60 # never happens normally, but helps when shell users make mistakes
68# warn join ":", $m->at ($x, $y);#d# 61 $m->linkable
69# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 62 or return 1;
70# return 0;
71 63
72 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 64 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
73} 65}
74 66
75sub enter_map { 67sub enter_map {
76 my ($pl) = @_; 68 my ($pl) = @_;
77 69
78 warn $pl->ob->name, ": enter map 1\n";#d#
79 my $ob = $pl->ob; 70 my $ob = $pl->ob;
80 71
81 my ($map, $x, $y) 72 my ($map, $x, $y)
82 = $ob->{_link_pos} 73 = $ob->{_link_pos}
83 ? @{delete $ob->{_link_pos}} 74 ? @{delete $ob->{_link_pos}}
84 : ($pl->maplevel, $ob->x, $ob->y); 75 : ($pl->maplevel, $ob->x, $ob->y);
85 76
86 warn $pl->ob->name, ": enter map 2\n";#d#
87 $ob->enter_link; 77 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
89 78
90 my $m = cf::map::find $map; 79 my $m = cf::map::find $map;
91 my $time = delete $pl->{unclean_save}; 80 my $time = delete $pl->{unclean_save};
92 warn $pl->ob->name, ": enter map 4\n";#d#
93 81
94 if ($time && $m) { 82 if ($time && $m) {
95 if ($time < $m->{instantiate_time}) { 83 if ($time < $m->{instantiate_time}) {
96 # the map was reset in the meantime 84 # the map was reset in the meantime
97 my $age = $cf::RUNTIME - $time; 85 my $age = $cf::RUNTIME - $time;
98 86
99 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 87 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
100 88
101 if ($age >= $MAX_DISCONNECT_TIME) { 89 if ($age >= $MAX_DISCONNECT_TIME) {
102 $ob->message ( 90 $ob->message (
103 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 91 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
104 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. " 92 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
… …
130 cf::NDI_RED 118 cf::NDI_RED
131 ); 119 );
132 } 120 }
133 } 121 }
134 122
135 warn $pl->ob->name, ": enter map 5\n";#d#
136 #$ob->goto ($map, $x, $y); 123 $ob->goto ($map, $x, $y);
137 $ob->goto ($map, $x, $y, sub { 124}
138 warn $pl->ob->name, ": enter map check\n";#d# 125
139 $_[0] 126sub encode_password($) {
140 }, sub { 127 "!" . unpack "H*", $_[0]
141 warn $pl->ob->name, ": enter map done\n";#d# 128}
129
130sub compare_password($$) {
131 my ($pass, $token) = @_;
132
133 if ($token =~ /!!(.*)/) {
134 return +(substr $pass, 0, 8) eq pack "H*", $1;
135 } elsif ($token =~ /!(.*)/) {
136 return $pass eq pack "H*", $1;
137 } else {
138 return $token eq crypt $pass, $token;
142 }); 139 }
143 warn $pl->ob->name, ": enter map 6\n";#d#
144
145} 140}
146 141
147# delete a player directory, be non-blocking AND synchronous... 142# delete a player directory
148# (thats hard, so we crap out and fork).
149sub nuke_playerdir { 143sub nuke_playerdir {
150 my ($user) = @_; 144 my ($user) = @_;
151 145
146 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
147
152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 148 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
153
154 cf::fork_call {
155 rename "$PLAYERDIR/$user", $temp; 149 aio_rename "$PLAYERDIR/$user", $temp;
156 system "rm", "-rf", $temp; 150 IO::AIO::aio_rmtree $temp;
151}
152
153sub login_done {
154 my ($pl) = @_;
155
156 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
157 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
157 }; 158 }
159}
160
161sub chargen {
162 my ($ns, $user, $pass) = @_;
163
164 # the rest of this function is character creation
165 $Coro::current->{desc} = "addme($user) chargen";
166
167 # just to make sure nothing is left over
168 # normally, nothing is there.
169 nuke_playerdir $user;
170
171 my $pl = cf::player::new $user;
172 $pl->password (encode_password $pass);
173 $pl->connect ($ns);
174 my $ob = $pl->ob;
175
176 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
177
178 while () {
179 $ob->update_stats;
180 $pl->save_stats;
181
182 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
183 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
184
185 if ($res =~ /^[Nn]/) {
186 last;
187 } elsif ($res > 0 && $res <= 7) {
188 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
189
190 if ($swap > 0 && $swap <= 7) {
191 $ob->swap_stats ($res - 1, $swap - 1);
192 }
193 } else {
194 $ob->roll_stats;
195 }
196
197 Coro::Timer::sleep 0.05;
198 }
199
200 $ob->set_animation (2);
201 $ob->add_statbonus;
202
203 while () {
204 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
205 my $msg = $ob->msg;
206 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
207 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
208
209 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
210 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
211
212 last if $res =~ /[dD]/;
213
214 $pl->chargen_race_next;
215 Coro::Timer::sleep 0.05;
216 }
217
218 # create the playerdir, if necessary, as chargen_race_done did it before
219 # presumably because of unique maps
220 aio_mkdir playerdir $pl, 0770;
221 $pl->chargen_race_done;
222
223 while () {
224 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
225 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
226
227 if ($res =~ /^[fF]/) {
228 $pl->gender (1);
229 last;
230 } elsif ($res =~ /^[mM]/) {
231 $pl->gender (0);
232 last;
233 }
234 Coro::Timer::sleep 0.05;
235 }
236
237 $ob->reply (undef, "Welcome to Deliantra!");
238
239 # XXX: Workaround for delayed client ext protocol handshake
240 $pl->esrv_new_player;
241
242 delete $pl->{deny_save};
158} 243}
159 244
160cf::client->attach (on_addme => sub { 245cf::client->attach (on_addme => sub {
161 my ($ns) = @_; 246 my ($ns) = @_;
162 247
163 if (!$ns->facecache)
164 {
165 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
166
167
168***
169*** WARNING:
170*** Your client does not support face/image caching,
171*** or it has been disabled. Face caching is mandatory
172*** so please enable it or use a newer client.
173***
174*** Look at your client preferences:
175***
176*** deliantra: all known versions automatically enable the facecache.
177*** cfclient: use the -cache commandline option.
178*** cfclient: map will not redraw automatically (bug).
179*** gcfclient: use -cache commandline option, or enable
180*** gcfclient: Client => Configure => Map & Image => Cache Images.
181*** jcrossclient: your client is broken, use deliantra or gcfclient.
182***
183***
184EOF
185 if ($ns->version =~ /jcrossclient/) {
186 # let them, for now
187 } else {
188 $ns->flush;
189 return $ns->destroy;
190 }
191
192 # $ns->facecache = true;
193 }
194
195 if ($ns->mapmode < cf::Map1aCmd) {
196 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
197
198
199***
200*** WARNING:
201*** Your client is too old. Please upgrade to a newer version.
202EOF
203
204 $ns->flush;
205 return $ns->destroy;
206 }
207
208 $ns->pl and return $ns->destroy; 248 $ns->{addme}++ and return $ns->destroy;
209 249
210 $ns->async (sub { 250 $ns->async (sub {
211 $Coro::current->{desc} = "addme init"; 251 $Coro::current->{desc} = "addme init";
212 252
213 my ($user, $pass); 253 my ($user, $pass);
… …
230 $ns->send_drawinfo ( 270 $ns->send_drawinfo (
231 "That username is currently used in another login session. " 271 "That username is currently used in another login session. "
232 . "Chose another, or wait till the other session has ended.", 272 . "Chose another, or wait till the other session has ended.",
233 cf::NDI_RED 273 cf::NDI_RED
234 ); 274 );
235 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 275 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
236 last; 276 last;
237 } else { 277 } else {
238 $ns->send_drawinfo ( 278 $ns->send_drawinfo (
239 "Your username contains illegal characters " 279 "Your username contains illegal characters "
240 . "(only a-z, A-Z and 0-9 are allowed), " 280 . "(only a-z, A-Z and 0-9 are allowed), "
241 . "or is not between 3 and 18 characters in length.", 281 . "or is not between 3 and 20 characters in length.",
242 cf::NDI_RED 282 cf::NDI_RED
243 ); 283 );
244 } 284 }
245 Coro::Timer::sleep 0.4; 285 Coro::Timer::sleep 0.4;
246 } 286 }
… …
285 325
286 # try to read the user file and check the password 326 # try to read the user file and check the password
287 if (my $pl = cf::player::find $user) { 327 if (my $pl = cf::player::find $user) {
288 aio_stat $pl->path and next; 328 aio_stat $pl->path and next;
289 my $mtime = (stat _)[9]; 329 my $mtime = (stat _)[9];
290 my $hash = $pl->password; 330 my $token = $pl->password;
291 331
292 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 332 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
293 nuke_str $pass; 333 # player exists and passwords match - we can proceed
334
294 # password matches, wonderful 335 # password matches, wonderful
295 my $pl = cf::player::find $user or next; 336 my $pl = cf::player::find $user or next;
296 $pl->connect ($ns); 337 $pl->connect ($ns);
297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
298 enter_map $pl; 338 enter_map $pl;
339 login_done $pl;
299 last; 340 return;
300 } elsif (can_cleanup $pl, $mtime) { 341 } elsif (can_cleanup $pl, $mtime) {
301 Coro::Timer::sleep 1; 342 Coro::Timer::sleep 1;
302 343
303 $ns->send_drawinfo ( 344 $ns->send_drawinfo (
304 "Player exists, but password does not match. If this is your account, " 345 "Player exists, but password does not match. If this is your account, "
305 . "please try again. If not, you can now decide to take over this account " 346 . "please try again. If not, you can now decide to take over this account "
306 . "because it has not been in-use for some time.", 347 . "because it has not been in-use for some time.",
307 cf::NDI_RED 348 cf::NDI_RED
308 ); 349 );
309 350
310 #TODO: nuke_str
311 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/ 351 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
312 or next; 352 or next;
313 353
314 # check if the file hasn't changed 354 # check if the file hasn't changed
315 aio_stat cf::player::path $user and next; 355 aio_stat cf::player::path $user and next;
… …
317 357
318 $pl->quit_character; 358 $pl->quit_character;
319 359
320 # fall through to creation 360 # fall through to creation
321 } else { 361 } else {
322 nuke_str $pass;
323
324 Coro::Timer::sleep 1; 362 Coro::Timer::sleep 1;
325 363
326 $ns->send_drawinfo ( 364 $ns->send_drawinfo (
327 "Wrong username or password. Please try again " 365 "Wrong username or password. Please try again "
328 . "(check for Numlock and other semi-obvious error sources).", 366 . "(check for Numlock and other semi-obvious error sources).",
… …
330 ); 368 );
331 next; 369 next;
332 } 370 }
333 } else { 371 } else {
334 # unable to load the playerfile: 372 # unable to load the playerfile:
335 # check wether the player dir exists, which means the file is corrupted or 373 # check whether the player dir exists, which means the file is corrupted or
336 # something very similar. 374 # something very similar.
337 if (!aio_stat cf::player::playerdir $user) { 375 if (!aio_stat cf::player::playerdir $user) {
338 $ns->send_drawinfo ( 376 $ns->send_drawinfo (
339 "Unable to retrieve this player. It might be a locked or broken account. " 377 "Unable to retrieve this player. It might be a locked or broken account. "
340 . "If this is your account, ask a dungeon master for assistance. " 378 . "If this is your account, ask a dungeon master for assistance. "
… …
343 ); 381 );
344 next; 382 next;
345 } 383 }
346 } 384 }
347 385
348 # the rest of this function is character creation
349 $Coro::current->{desc} = "addme($user) chargen";
350
351 # just to make sure nothing is left over
352 nuke_playerdir $user;
353
354 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 386 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
355 387
356 if ($pass2 ne $pass) { 388 if ($pass2 ne $pass) {
357 nuke_str $pass;
358 nuke_str $pass2;
359 $ns->send_drawinfo ( 389 $ns->send_drawinfo (
360 "The passwords do not match, please try again.", 390 "The passwords do not match, please try again.",
361 cf::NDI_RED 391 cf::NDI_RED
362 ); 392 );
363 Coro::Timer::sleep 0.5; 393 Coro::Timer::sleep 0.5;
364 next; 394 next;
365 } 395 }
366 396
367 nuke_str $pass2;
368
369 my $pl = cf::player::new $user;
370 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
371 nuke_str $pass;
372 $pl->connect ($ns);
373 my $ob = $pl->ob;
374
375 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
376
377 while () {
378 $ob->update_stats;
379 $pl->save_stats;
380
381 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
382 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
383
384 if ($res =~ /^[Nn]/) {
385 last;
386 } elsif ($res > 0 && $res <= 7) {
387 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
388
389 if ($swap > 0 && $swap <= 7) {
390 $ob->swap_stats ($res - 1, $swap - 1);
391 }
392 } else {
393 $ob->roll_stats;
394 }
395
396 Coro::Timer::sleep 0.05;
397 }
398
399 $ob->set_animation (2);
400 $ob->add_statbonus;
401
402 while () {
403 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
404 my $msg = $ob->msg;
405 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
406 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
407
408 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
409 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
410
411 last if $res =~ /[dD]/;
412
413 $pl->chargen_race_next;
414 Coro::Timer::sleep 0.2;
415 }
416
417 # create the playerdir, if necessary, as chargen_race_done did it before
418 # presumably because of unique maps
419 aio_mkdir playerdir $pl, 0770;
420 $pl->chargen_race_done;
421
422 while () {
423 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
424 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
425
426 if ($res =~ /^[fF]/) {
427 $pl->gender (1);
428 last;
429 } elsif ($res =~ /^[mM]/) {
430 $pl->gender (0);
431 last;
432 }
433 Coro::Timer::sleep 0.2;
434 }
435
436 $ob->reply (undef, "Welcome to Deliantra!");
437
438 delete $pl->{deny_save};
439
440 last; 397 last;
441 } 398 }
399
400 # lock again, too layz to make this nicer
401 local $cf::LOGIN_LOCK{$user} = 1;
402
403 chargen $ns, $user, $pass;
404 login_done $ns->pl;
442 }); 405 });
443}); 406});
444 407
408cf::client->attach (
409 on_version => sub {
410 my ($ns, $arg) = @_;
411
412 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
413 $ns->ext_msg (nonces => @{ $ns->{nonces} });
414 },
415);
416
417#cf::register_async_exticmd create_login => sub {
418# my ($ns, $reply, $user, $pass) = @_;
419#
420# $ns->{addme}++ and return $ns->destroy;
421#};
422
423cf::register_async_exticmd login => sub {
424 my ($ns, $reply, $user, $hash) = @_;
425
426 $ns->{addme}++ and return $ns->destroy;
427
428 $ns->async (sub {
429 local $cf::LOGIN_LOCK{$user} = 1;
430
431 $Coro::current->{desc} = "login($user) check";
432
433 my $fail = sub {
434 $reply->(0, $_[0]);
435 $ns->flush; # does not ensure that the data reaches the client - TODO
436 # need to do this in another thread, as this one gets canceled
437 Coro::async_pool {
438 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
439 $ns->destroy;
440 };
441 Coro::schedule; # do the destroy, should not return
442 };
443
444 # try to read the user file and check the password
445 my $pl = cf::player::find $user
446 or return $fail->("User '$user' does not exist - wrong spelling?");
447
448 aio_stat $pl->path
449 and return $ns->destroy;
450
451 my $mtime = (stat _)[9];
452 my $token = $pl->password;
453
454 $token = $token =~ /^!/
455 ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
456 : pack "H*", $token;
457
458 $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
459
460 $token eq $hash
461 or $cf::CFG{ext_login_nocheck}
462 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
463
464 # player exists and passwords match - we can proceed
465
466 $pl->connect ($ns);
467 enter_map $pl;
468 login_done $pl;
469
470 $reply->(1, "Success");
471 });
472};
473
474cf::register_command password => sub {
475 my ($pl, $arg) = @_;
476
477 unless ($pl->flag (cf::FLAG_WIZ)) {
478 $pl->message (
479 "The password can currently only changed by a DM.",
480 cf::NDI_UNIQUE | cf::NDI_REPLY);
481 return;
482 }
483
484 $pl->message (#d#
485 "Passwords cannot currently be changed.",#d#
486 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
487 return;#d#
488
489 my (@args) = split /\s+/, $arg;
490 my ($player, $new_pw) = @args;
491
492 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
493 $pl->message (
494 "Usage: password <player> [<new password>]",
495 cf::NDI_UNIQUE | cf::NDI_REPLY);
496 return;
497 }
498
499 if ($new_pw eq '') {
500 $new_pw =
501 join '',
502 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
503 1..9;
504 }
505
506 cf::async {
507 my $plc = cf::player::find $player;
508 if ($plc) {
509 $plc->password (encode_password $new_pw);
510 $pl->message (
511 "Ok, changed password of '$player' to '$new_pw'!",
512 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
513 } else {
514 $pl->message (
515 "Fail! Couldn't set password for '$player', "
516 . "he doesn't seem to exist!",
517 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
518 }
519 };
520};
521
445cf::register_command quit => sub { 522cf::register_command quit => sub {
446 my ($ob, $arg) = @_; 523 my ($ob, $arg) = @_;
447 524
448 $ob->reply (undef, 525 $ob->send_msg (undef,
449 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 526 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
450 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 527 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
451 cf::NDI_UNIQUE | cf::NDI_RED); 528 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
452}; 529};
453 530
454cf::register_command quit_character => sub { 531cf::register_command quit_character => sub {
455 my ($ob, $arg) = @_; 532 my ($ob, $arg) = @_;
456 533
457 my $pl = $ob->contr; 534 my $pl = $ob->contr;
458 535
459 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 536 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
460 if ($_[0] !~ /^[yY]/) { 537 if ($_[0] !~ /^[yY]/) {
461 $ob->reply (undef, 538 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
462 "Ok, not not quitting then.",
463 cf::NDI_UNIQUE | cf::NDI_RED);
464 } else { 539 } else {
465 $ob->reply (undef, 540 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
466 "Ok, quitting, hope to see you again.", 541 cf::async {
467 cf::NDI_UNIQUE | cf::NDI_RED);
468 $pl->ns->flush;
469 cf::async { $pl->quit_character }; 542 $pl->quit_character;
543 };
470 } 544 }
471 }); 545 });
472}; 546};
473 547
474cf::object->attach ( 548cf::object->attach (
… …
480 554
481 my $pl = $ob->contr; 555 my $pl = $ob->contr;
482 556
483 # update respawn position 557 # update respawn position
484 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 558 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
485 cf::async { $pl->save };
486 559
560 cf::async {
487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 561 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
488 $ob->check_score; 562 ext::highscore::check $ob;
489 563
490 $ob->reply (undef, "In the future, you will wake up here when you die."); 564 $pl->save;
491 565
566 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
567
568 my $ns = $pl->ns
569 or return;
570
492 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 571 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
493 if ($_[0] !~ /^[yY]/) { 572 if ($_[0] !~ /^[yY]/) {
494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
495 $pl->deactivate; 574 $pl->deactivate;
496 $pl->ns->destroy; 575 $pl->ns->destroy;
497 } else { 576 }
498 cf::async { $pl->save };
499 } 577 });
500 }); 578 };
501 }, 579 },
502); 580);
503 581
504cf::player->attach ( 582cf::player->attach (
505 on_login => sub { 583 on_login => sub {
… …
520 unless safe_spot $pl; 598 unless safe_spot $pl;
521 } 599 }
522 }, 600 },
523); 601);
524 602
525#############################################################################
526
527our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
528our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
529
530our $SCHEDULER = cf::async_ext {
531 $Coro::current->{desc} = "player scheduler";
532
533 while () {
534 Coro::EV::timer_once $SCHEDULE_INTERVAL;
535
536 # this weird form of iteration over values is used because
537 # the hash changes underneath us frequently, and for
538 # keeps a direct reference to the value without (in 5.8 perls)
539 # keeping a reference, so this is prone to crashes or worse.
540 my @players = keys %cf::PLAYER;
541 for (@players) {
542 my $pl = $cf::PLAYER{$_}
543 or next;
544 $pl->valid or next;
545
546 eval {
547 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
548 $pl->save;
549
550 unless ($pl->active || $pl->ns) {
551 # check refcounts, this is tricky and needs to be adjusted to fit server internals
552 my $ob = $pl->ob;
553
554 my $pl_ref = $pl->refcnt_cnt;
555 my $ob_ref = $ob->refcnt_cnt;
556
557 ## pl_ref == $pl + ob->contr + %cf::PLAYER
558 ## ob_ref == $ob + pl->observe + simply being an object
559 if ($pl_ref == 3 && $ob_ref == 3) {
560 warn "player-scheduler destroy ", $ob->name;#d#
561
562 # remove from sight and get fresh "copies"
563 $pl = delete $cf::PLAYER{$ob->name};
564 $ob = $pl->ob;
565
566 $pl->destroy; # destroys $ob
567 } else {
568 my $a_ = $pl->refcnt;#d#
569 my $b_ = $ob->refcnt;#d#
570
571 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
572 }
573 }
574 }
575 };
576 warn $@ if $@;
577 cf::cede_to_tick;
578 };
579 }
580};
581
582$SCHEDULER->prio (1);
583

Diff Legend

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