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.78 by root, Mon Jan 7 01:55:19 2008 UTC vs.
Revision 1.122 by root, Thu Nov 15 07:08:15 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
… …
52 ); 45 );
53 46
54 1 47 1
55} 48}
56 49
57sub safe_spot($$$) { 50sub safe_spot($) {
58 my ($m, $x, $y) = @_; 51 my ($pl) = @_;
52
53 my $ob = $pl->ob;
59 54
60 return 0; 55 my $m = $ob->map
61 warn join ":", $m->at ($x, $y);#d# 56 or return;
62 warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 57 my $x = $ob->x;
63 return 0; 58 my $y = $ob->y;
59
60 # never happens normally, but helps when shell users make mistakes
61 $m->linkable
62 or return 1;
64 63
65 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 64 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
66} 65}
67 66
68sub enter_map { 67sub enter_map {
… …
78 $ob->enter_link; 77 $ob->enter_link;
79 78
80 my $m = cf::map::find $map; 79 my $m = cf::map::find $map;
81 my $time = delete $pl->{unclean_save}; 80 my $time = delete $pl->{unclean_save};
82 81
83 if ($time && $m && !safe_spot $m, $x, $y) { 82 if ($time && $m) {
84 if ($time < $m->{instantiate_time}) { 83 if ($time < $m->{instantiate_time}) {
85 # the map was reset in the meantime 84 # the map was reset in the meantime
86 my $age = $cf::RUNTIME - $time; 85 my $age = $cf::RUNTIME - $time;
87 86
88 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#
89
90 ($map, $x, $y) = $pl->savebed;
91 88
92 if ($age >= $MAX_DISCONNECT_TIME) { 89 if ($age >= $MAX_DISCONNECT_TIME) {
93 $ob->message ( 90 $ob->message (
94 "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. "
95 . "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. "
… …
98 cf::NDI_RED 95 cf::NDI_RED
99 ); 96 );
100 # kill them. 97 # kill them.
101 # reminds me of the famous badness 10000 syndrome... 98 # reminds me of the famous badness 10000 syndrome...
102 $ob->stats->hp (-10000); #] if they survive this they deserved to live 99 $ob->stats->hp (-10000); #] if they survive this they deserved to live
103 $pl->killer ("a cave-in"); 100 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
104 } else { 101 } else {
102 ($map, $x, $y) = $pl->savebed;
103
105 $ob->message ( 104 $ob->message (
106 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 105 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
107 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " 106 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
108 . "Better use a savebed next time, much worse things could have happened... " 107 . "Better use a savebed next time, much worse things could have happened... "
109 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>", 108 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
… …
122 } 121 }
123 122
124 $ob->goto ($map, $x, $y); 123 $ob->goto ($map, $x, $y);
125} 124}
126 125
127# delete a player directory, be non-blocking AND synchronous... 126sub encode_password($) {
128# (thats hard, so we crap out and fork). 127 "!" . unpack "H*", $_[0]
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;
139 }
140}
141
142# delete a player directory
129sub nuke_playerdir { 143sub nuke_playerdir {
130 my ($user) = @_; 144 my ($user) = @_;
131 145
146 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
147
132 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 148 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
133
134 cf::fork_call {
135 rename "$PLAYERDIR/$user", $temp; 149 aio_rename "$PLAYERDIR/$user", $temp;
136 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);
137 }; 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};
138} 243}
139 244
140cf::client->attach (on_addme => sub { 245cf::client->attach (on_addme => sub {
141 my ($ns) = @_; 246 my ($ns) = @_;
142
143 if (!$ns->facecache)
144 {
145 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
146
147
148***
149*** WARNING:
150*** Your client does not support face/image caching,
151*** or it has been disabled. Face caching is mandatory
152*** so please enable it or use a newer client.
153***
154*** Look at your client preferences:
155***
156*** CFPlus: all known versions automatically enable the facecache.
157*** cfclient: use the -cache commandline option.
158*** cfclient: map will not redraw automatically (bug).
159*** gcfclient: use -cache commandline option, or enable
160*** gcfclient: Client => Configure => Map & Image => Cache Images.
161*** jcrossclient: your client is broken, use CFPlus or gcfclient.
162***
163***
164EOF
165 if ($ns->version =~ /jcrossclient/) {
166 # let them, for now
167 } else {
168 $ns->flush;
169 return $ns->destroy;
170 }
171
172 # $ns->facecache = true;
173 }
174
175 if ($ns->mapmode < cf::Map1aCmd) {
176 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
177
178
179***
180*** WARNING:
181*** Your client is too old. Please upgrade to a newer version.
182EOF
183
184 $ns->flush;
185 return $ns->destroy;
186 }
187 247
188 $ns->pl and return $ns->destroy; 248 $ns->pl and return $ns->destroy;
189 249
190 $ns->async (sub { 250 $ns->async (sub {
191 $Coro::current->{desc} = "addme init"; 251 $Coro::current->{desc} = "addme init";
… …
202 cf::NDI_BLUE 262 cf::NDI_BLUE
203 ); 263 );
204 264
205 # read username 265 # read username
206 while () { 266 while () {
207 $user = query $ns, 0, "What is your name?\n:"; 267 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
208 268
209 if ($cf::LOGIN_LOCK{$user}) { 269 if ($cf::LOGIN_LOCK{$user}) {
210 $ns->send_drawinfo ( 270 $ns->send_drawinfo (
211 "That username is currently used in another login session. " 271 "That username is currently used in another login session. "
212 . "Chose another, or wait till the other session has ended.", 272 . "Chose another, or wait till the other session has ended.",
213 cf::NDI_RED 273 cf::NDI_RED
214 ); 274 );
215 } 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/) {
216 last; 276 last;
217 } else { 277 } else {
218 $ns->send_drawinfo ( 278 $ns->send_drawinfo (
219 "Your username contains illegal characters " 279 "Your username contains illegal characters "
220 . "(only a-z, A-Z and 0-9 are allowed), " 280 . "(only a-z, A-Z and 0-9 are allowed), "
221 . "or is not between 3 and 18 characters in length.", 281 . "or is not between 3 and 20 characters in length.",
222 cf::NDI_RED 282 cf::NDI_RED
223 ); 283 );
224 } 284 }
225 Coro::Timer::sleep 0.4; 285 Coro::Timer::sleep 0.4;
226 } 286 }
… …
265 325
266 # try to read the user file and check the password 326 # try to read the user file and check the password
267 if (my $pl = cf::player::find $user) { 327 if (my $pl = cf::player::find $user) {
268 aio_stat $pl->path and next; 328 aio_stat $pl->path and next;
269 my $mtime = (stat _)[9]; 329 my $mtime = (stat _)[9];
270 my $hash = $pl->password; 330 my $token = $pl->password;
271 331
272 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 332 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
273 nuke_str $pass; 333 # player exists and passwords match - we can proceed
334
274 # password matches, wonderful 335 # password matches, wonderful
275 my $pl = cf::player::find $user or next; 336 my $pl = cf::player::find $user or next;
276 $pl->connect ($ns); 337 $pl->connect ($ns);
277 enter_map $pl; 338 enter_map $pl;
339 login_done $pl;
278 last; 340 return;
279 } elsif (can_cleanup $pl, $mtime) { 341 } elsif (can_cleanup $pl, $mtime) {
280 Coro::Timer::sleep 1; 342 Coro::Timer::sleep 1;
281 343
282 $ns->send_drawinfo ( 344 $ns->send_drawinfo (
283 "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, "
284 . "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 "
285 . "because it has not been in-use for some time.", 347 . "because it has not been in-use for some time.",
286 cf::NDI_RED 348 cf::NDI_RED
287 ); 349 );
288 350
289 #TODO: nuke_str
290 (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]/
291 or next; 352 or next;
292 353
293 # check if the file hasn't changed 354 # check if the file hasn't changed
294 aio_stat cf::player::path $user and next; 355 aio_stat cf::player::path $user and next;
… …
296 357
297 $pl->quit_character; 358 $pl->quit_character;
298 359
299 # fall through to creation 360 # fall through to creation
300 } else { 361 } else {
301 nuke_str $pass;
302
303 Coro::Timer::sleep 1; 362 Coro::Timer::sleep 1;
304 363
305 $ns->send_drawinfo ( 364 $ns->send_drawinfo (
306 "Wrong username or password. Please try again " 365 "Wrong username or password. Please try again "
307 . "(check for Numlock and other semi-obvious error sources).", 366 . "(check for Numlock and other semi-obvious error sources).",
… …
309 ); 368 );
310 next; 369 next;
311 } 370 }
312 } else { 371 } else {
313 # unable to load the playerfile: 372 # unable to load the playerfile:
314 # 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
315 # something very similar. 374 # something very similar.
316 if (!aio_stat cf::player::playerdir $user) { 375 if (!aio_stat cf::player::playerdir $user) {
317 $ns->send_drawinfo ( 376 $ns->send_drawinfo (
318 "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. "
319 . "If this is your account, ask a dungeon master for assistance. " 378 . "If this is your account, ask a dungeon master for assistance. "
… …
322 ); 381 );
323 next; 382 next;
324 } 383 }
325 } 384 }
326 385
327 # the rest of this function is character creation
328 $Coro::current->{desc} = "addme($user) chargen";
329
330 # just to make sure nothing is left over
331 nuke_playerdir $user;
332
333 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.";
334 387
335 if ($pass2 ne $pass) { 388 if ($pass2 ne $pass) {
336 nuke_str $pass;
337 nuke_str $pass2;
338 $ns->send_drawinfo ( 389 $ns->send_drawinfo (
339 "The passwords do not match, please try again.", 390 "The passwords do not match, please try again.",
340 cf::NDI_RED 391 cf::NDI_RED
341 ); 392 );
342 Coro::Timer::sleep 0.5; 393 Coro::Timer::sleep 0.5;
343 next; 394 next;
344 } 395 }
345 396
346 nuke_str $pass2;
347
348 my $pl = cf::player::new $user;
349 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
350 nuke_str $pass;
351 $pl->connect ($ns);
352 my $ob = $pl->ob;
353
354 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
355
356 while () {
357 $ob->update_stats;
358 $pl->save_stats;
359
360 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
361 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
362
363 if ($res =~ /^[Nn]/) {
364 last;
365 } elsif ($res > 0 && $res <= 7) {
366 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
367
368 if ($swap > 0 && $swap <= 7) {
369 $ob->swap_stats ($res - 1, $swap - 1);
370 }
371 } else {
372 $ob->roll_stats;
373 }
374
375 Coro::Timer::sleep 0.2;
376 }
377
378 $ob->set_animation (2);
379 $ob->add_statbonus;
380
381 while () {
382 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
383 my $msg = $ob->msg;
384 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
385 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
386
387 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
388 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
389
390 last if $res =~ /[dD]/;
391
392 $pl->chargen_race_next;
393 Coro::Timer::sleep 0.2;
394 }
395
396 $pl->chargen_race_done;
397
398 while () {
399 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
400 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
401
402 if ($res =~ /^[fF]/) {
403 $pl->gender (1);
404 last;
405 } elsif ($res =~ /^[mM]/) {
406 $pl->gender (0);
407 last;
408 }
409 Coro::Timer::sleep 0.2;
410 }
411
412 $ob->reply (undef, "Welcome to Deliantra!");
413
414 delete $pl->{deny_save};
415
416 last; 397 last;
417 } 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;
418 }); 405 });
419}); 406});
420 407
408cf::client->attach (
409 on_version => sub {
410 my ($ns, $arg) = @_;
411
412 $ns->ext_msg (nonces => map { join "", map { chr rand 256 } 0..63 } 1..2);
413 },
414);
415
416#cf::register_async_exticmd create_login => sub {
417# my ($ns, $reply, $user, $pass) = @_;
418#
419# $ns->pl and return $ns->destroy;
420#};
421
422cf::register_async_exticmd login => sub {
423 my ($ns, $reply, $user, $hash) = @_;
424
425 $ns->pl and return $ns->destroy;
426};
427
428cf::register_command password => sub {
429 my ($pl, $arg) = @_;
430
431 unless ($pl->flag (cf::FLAG_WIZ)) {
432 $pl->message (
433 "The password can currently only changed by a DM.",
434 cf::NDI_UNIQUE | cf::NDI_REPLY);
435 return;
436 }
437
438 my (@args) = split /\s+/, $arg;
439 my ($player, $new_pw) = @args;
440
441 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
442 $pl->message (
443 "Usage: password <player> [<new password>]",
444 cf::NDI_UNIQUE | cf::NDI_REPLY);
445 return;
446 }
447
448 if ($new_pw eq '') {
449 $new_pw =
450 join '',
451 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
452 1..9;
453 }
454
455 cf::async {
456 my $plc = cf::player::find $player;
457 if ($plc) {
458 $plc->password (encode_password $new_pw);
459 $pl->message (
460 "Ok, changed password of '$player' to '$new_pw'!",
461 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
462 } else {
463 $pl->message (
464 "Fail! Couldn't set password for '$player', "
465 . "he doesn't seem to exist!",
466 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
467 }
468 };
469};
470
421cf::register_command quit => sub { 471cf::register_command quit => sub {
422 my ($ob, $arg) = @_; 472 my ($ob, $arg) = @_;
423 473
424 $ob->reply (undef, 474 $ob->send_msg (undef,
425 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 475 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
426 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 476 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
427 cf::NDI_UNIQUE | cf::NDI_RED); 477 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
428}; 478};
429 479
430cf::register_command quit_character => sub { 480cf::register_command quit_character => sub {
431 my ($ob, $arg) = @_; 481 my ($ob, $arg) = @_;
432 482
433 my $pl = $ob->contr; 483 my $pl = $ob->contr;
434 484
435 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 485 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
436 if ($_[0] !~ /^[yY]/) { 486 if ($_[0] !~ /^[yY]/) {
437 $ob->reply (undef, 487 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
438 "Ok, not not quitting then.",
439 cf::NDI_UNIQUE | cf::NDI_RED);
440 } else { 488 } else {
441 $ob->reply (undef, 489 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
442 "Ok, quitting, hope to see you again.", 490 cf::async {
443 cf::NDI_UNIQUE | cf::NDI_RED);
444 $pl->ns->flush;
445 cf::async { $pl->quit_character }; 491 $pl->quit_character;
492 };
446 } 493 }
447 }); 494 });
448}; 495};
449 496
450cf::object->attach ( 497cf::object->attach (
… …
456 503
457 my $pl = $ob->contr; 504 my $pl = $ob->contr;
458 505
459 # update respawn position 506 # update respawn position
460 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 507 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
461 cf::async { $pl->save };
462 508
463 $pl->killer ("left"); 509 cf::async {
464 $ob->check_score; 510 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
511 ext::highscore::check $ob;
465 512
466 $ob->reply (undef, "In the future, you will wake up here when you die."); 513 $pl->save;
467 514
515 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
516
517 my $ns = $pl->ns
518 or return;
519
468 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 520 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
469 if ($_[0] !~ /^[yY]/) { 521 if ($_[0] !~ /^[yY]/) {
470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 522 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
471 $pl->deactivate; 523 $pl->deactivate;
472 $pl->ns->destroy; 524 $pl->ns->destroy;
473 } else { 525 }
474 cf::async { $pl->save };
475 } 526 });
476 }); 527 };
477 }, 528 },
478); 529);
479 530
480cf::player->attach ( 531cf::player->attach (
481 on_login => sub { 532 on_login => sub {
… …
490 541
491 if ($cleanly) { 542 if ($cleanly) {
492 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 543 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
493 } else { 544 } else {
494 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 545 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
495 $pl->{unclean_save} = $cf::RUNTIME; 546 $pl->{unclean_save} = $cf::RUNTIME
547 unless safe_spot $pl;
496 } 548 }
497 }, 549 },
498); 550);
499 551
500#############################################################################
501
502our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
503our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
504
505our $SCHEDULER = cf::async_ext {
506 $Coro::current->{desc} = "player scheduler";
507
508 while () {
509 Coro::EV::timer_once $SCHEDULE_INTERVAL;
510
511 # this weird form of iteration over values is used because
512 # the hash changes underneath us frequently, and for
513 # keeps a direct reference to the value without (in 5.8 perls)
514 # keeping a reference, so this is prone to crashes or worse.
515 my @players = keys %cf::PLAYER;
516 for (@players) {
517 my $pl = $cf::PLAYER{$_}
518 or next;
519 $pl->valid or next;
520
521 eval {
522 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
523 $pl->save;
524
525 unless ($pl->active || $pl->ns) {
526 # check refcounts, this is tricky and needs to be adjusted to fit server internals
527 my $ob = $pl->ob;
528
529 my $pl_ref = $pl->refcnt_cnt;
530 my $ob_ref = $ob->refcnt_cnt;
531
532 ## pl_ref == $pl + ob->contr + %cf::PLAYER
533 ## ob_ref == $ob + pl->observe + simply being an object
534 if ($pl_ref == 3 && $ob_ref == 3) {
535 warn "player-scheduler destroy ", $ob->name;#d#
536
537 # remove from sight and get fresh "copies"
538 $pl = delete $cf::PLAYER{$ob->name};
539 $ob = $pl->ob;
540
541 $pl->destroy; # destroys $ob
542 } else {
543 my $a_ = $pl->refcnt;#d#
544 my $b_ = $ob->refcnt;#d#
545
546 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
547 }
548 }
549 }
550 };
551 warn $@ if $@;
552 Coro::cede;
553 };
554 }
555};
556
557$SCHEDULER->prio (1);
558

Diff Legend

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