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

Diff Legend

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