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

Diff Legend

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