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.59 by root, Tue Jul 3 01:04:43 2007 UTC vs.
Revision 1.90 by root, Tue Sep 16 16:03:02 2008 UTC

… …
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use List::Util qw(min max);
8 7
9our %EXT_SETUP; 8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
10 9
11# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
12sub nuke_str { 11sub nuke_str {
13 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
14} 13}
… …
53 ); 52 );
54 53
55 1 54 1
56} 55}
57 56
57sub safe_spot($) {
58 my ($pl) = @_;
59
60 my $ob = $pl->ob;
61
62 my $m = $ob->map
63 or return;
64 my $x = $ob->x;
65 my $y = $ob->y;
66
67# return 0;#d#
68# warn join ":", $m->at ($x, $y);#d#
69# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
70# return 0;
71
72 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
73}
74
58sub enter_map { 75sub enter_map {
59 my ($pl) = @_; 76 my ($pl) = @_;
60 77
78 warn $pl->ob->name, ": enter map 1\n";#d#
79 my $ob = $pl->ob;
80
61 my ($map, $x, $y) 81 my ($map, $x, $y)
62 = $pl->ob->{_link_pos} 82 = $ob->{_link_pos}
63 ? @{delete $pl->ob->{_link_pos}} 83 ? @{delete $ob->{_link_pos}}
64 : ($pl->maplevel, $pl->ob->x, $pl->ob->y); 84 : ($pl->maplevel, $ob->x, $ob->y);
65 85
86 warn $pl->ob->name, ": enter map 2\n";#d#
66 $pl->ob->enter_link; 87 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
67 89
90 my $m = cf::map::find $map;
68 if (my $time = delete $pl->{unclean_save}) { 91 my $time = delete $pl->{unclean_save};
69 if (my $m = cf::map::find $map) { 92 warn $pl->ob->name, ": enter map 4\n";#d#
93
94 if ($time && $m) {
70 if ($time < $m->{instantiate_time}) { 95 if ($time < $m->{instantiate_time}) {
71 # the map was reset in the meantime 96 # the map was reset in the meantime
72 my $age = $cf::RUNTIME - $time; 97 my $age = $cf::RUNTIME - $time;
98
73 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d# 99 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
74 100
75 # for now, just go back to savebed 101 if ($age >= $MAX_DISCONNECT_TIME) {
102 $ob->message (
103 "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. "
105 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
106 . "H<You disconnected too long without having used a savebed.>",
107 cf::NDI_RED
108 );
109 # kill them.
110 # reminds me of the famous badness 10000 syndrome...
111 $ob->stats->hp (-10000); #] if they survive this they deserved to live
112 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
113 } else {
76 ($map, $x, $y) = $pl->savebed; 114 ($map, $x, $y) = $pl->savebed;
77 115
78 $pl->ns->send_drawinfo ( 116 $ob->message (
79 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 117 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
80 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " 118 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
81 . "Better use a savebed next time, much worse things could have happened...", 119 . "Better use a savebed next time, much worse things could have happened... "
120 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
82 cf::NDI_RED 121 cf::NDI_RED
83 ); 122 );
123 }
84 } else { 124 } else {
85 $pl->ns->send_drawinfo ( 125 $ob->message (
86 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 126 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
87 . "as lots of things could happen when you leave by other means, such as cave-ins, " 127 . "as lots of things could happen when you leave by other means, such as cave-ins, "
88 . "or monsters suddenly snapping your body. Better use a savebed next time.", 128 . "or monsters suddenly snapping your body. Better use a savebed next time. "
129 . "H<Always apply a bed of reality to disconnect from the server.>",
89 cf::NDI_RED 130 cf::NDI_RED
90 ); 131 );
91 }
92 } 132 }
93 } 133 }
94 134
135 warn $pl->ob->name, ": enter map 5\n";#d#
95 $pl->ob->goto ($map, $x, $y); 136 #$ob->goto ($map, $x, $y);
137 $ob->goto ($map, $x, $y, sub {
138 warn $pl->ob->name, ": enter map check\n";#d#
139 $_[0]
140 }, sub {
141 warn $pl->ob->name, ": enter map done\n";#d#
142 });
143 warn $pl->ob->name, ": enter map 6\n";#d#
144
96} 145}
97 146
98# delete a player directory, be non-blocking AND synchronous... 147# delete a player directory, be non-blocking AND synchronous...
99# (thats hard, so we crap out and fork). 148# (thats hard, so we crap out and fork).
100sub nuke_playerdir { 149sub nuke_playerdir {
101 my ($user) = @_; 150 my ($user) = @_;
102 151
103 aio_stat "$PLAYERDIR/$user"; 152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
104 system "cd \Q$PLAYERDIR\E "
105 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
106 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
107}
108 153
109sub send_capabilities { 154 cf::fork_call {
155 rename "$PLAYERDIR/$user", $temp;
156 system "rm", "-rf", $temp;
157 };
158}
159
160cf::client->attach (on_addme => sub {
110 my ($ns) = @_; 161 my ($ns) = @_;
111 162
112 return unless $ns->extcmd;
113
114 $ns->ext_event (capabilities =>
115 # id, name, flags (1 == 2d), edge length
116 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
117 );
118}
119
120sub setup {
121 my ($ns, $args) = @_;
122
123 # run through the cmds of setup
124 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
125 #
126 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
127 # The client then must sort this out
128
129 my %setup = split / +/, $args;
130 while (my ($k, $v) = each %setup) {
131 if ($k eq "sound") {
132 $ns->sound ($v);
133
134 } elsif ($k eq "exp64") {
135 $setup{$k} = 1;
136
137 } elsif ($k eq "spellmon") {
138 $ns->monitor_spells ($v);
139
140 } elsif ($k eq "darkness") {
141 $ns->darkness ($v);
142
143 } elsif ($k eq "map1cmd") {
144 $ns->mapmode (cf::Map1Cmd) if $v > 0;
145
146 } elsif ($k eq "map1acmd") {
147 $ns->mapmode (cf::Map1aCmd) if $v > 0;
148
149 } elsif ($k eq "map2cmd") {
150 # gcfclient bug, map1acmd is sent too late
151 $ns->mapmode (cf::Map1aCmd);
152 $setup{$k} = "FALSE";
153
154 } elsif ($k eq "newmapcmd") {
155 $ns->newmapcmd ($v);
156
157 } elsif ($k eq "mapinfocmd") {
158 $ns->mapinfocmd ($v);
159
160 } elsif ($k eq "extcmd") {
161 $ns->extcmd ($v > 0);
162 send_capabilities $ns;
163
164 } elsif ($k eq "extmap") {
165 $ns->extmap ($v);
166
167 } elsif ($k eq "facecache") {
168 if (!$v) {
169 $v = 1;
170 $setup{$k} = $v;
171 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
172 }
173
174 $ns->facecache ($v);
175
176 } elsif ($k eq "faceset") {
177 $ns->faceset (0);
178 $setup{$k} = 0;
179 # $ns->image2 (1)
180
181 } elsif ($k eq "tileset") {
182 $setup{$k} = $ns->faceset ($v & 1);
183
184 } elsif ($k eq "itemcmd") {
185 # Version of the item protocol command to use. Currently,
186 # only supported versions are 1 and 2. Using a numeric
187 # value will make it very easy to extend this in the future.
188 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
189
190 $setup{$k} = $ns->itemcmd;
191
192 } elsif ($k eq "mapsize") {
193 my ($x, $y) = split /x/, $v;
194
195 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
196 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
197
198 $setup{$k} = "${x}x${y}";
199
200 } elsif ($k eq "extendedMapInfos") {
201 $ns->ext_mapinfos ($v);
202
203 } elsif ($k eq "extendedTextInfos") {
204 $ns->has_readable_type ($v);
205
206 } elsif ($k eq "smoothing") { # cfplus-style smoothing
207 $ns->smoothing ($v);
208
209 } elsif ($k eq "fxix") {
210 $v = 2 if $v > 2;
211 $ns->fxix ($v);
212 $setup{$k} = $v;
213
214 } elsif ($k eq "msg") {
215 $v = 2 if $v > 2;
216 $ns->can_msg ($v >= 2);
217 $setup{$k} = $v;
218
219 } elsif ($k eq "xwidget") {
220 # eXperimental server-side widgets
221 $ns->{can_widget} = 1;
222
223 } elsif ($k eq "excmd") {
224 # we support it
225
226 } else {
227 # other commands:
228 # sexp: no idea, probably for oudated servers
229 # tick: more stupidity, server should send a tick per tick
230
231 $setup{$k} = "FALSE";
232 }
233 }
234
235 $ns->send_packet (join " ", setup => %setup);
236
237 cf::datalog setup =>
238 request => $args,
239 reply => \%setup,
240 client => $ns->version,
241 ;
242}
243
244sub addme {
245 my ($ns) = @_;
246
247 if (!$ns->facecache) 163 if (!$ns->facecache)
248 { 164 {
249 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 165 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
250 166
251 167
252*** 168***
253*** WARNING: 169*** WARNING:
254*** Your client does not support face/image caching, 170*** Your client does not support face/image caching,
255*** or it has been disabled. Face caching is mandatory 171*** or it has been disabled. Face caching is mandatory
256*** so please enable it or use a newer client. 172*** so please enable it or use a newer client.
257*** 173***
258*** Look at your client preferences: 174*** Look at your client preferences:
259*** 175***
260*** CFPlus: all known versions automatically enable the facecache. 176*** deliantra: all known versions automatically enable the facecache.
261*** cfclient: use the -cache commandline option. 177*** cfclient: use the -cache commandline option.
262*** cfclient: map will not redraw automatically (bug). 178*** cfclient: map will not redraw automatically (bug).
263*** gcfclient: use -cache commandline option, or enable 179*** gcfclient: use -cache commandline option, or enable
264*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 180*** gcfclient: Client => Configure => Map & Image => Cache Images.
265*** jcrossclient: your client is broken, use CFPlus or gcfclient. 181*** jcrossclient: your client is broken, use deliantra or gcfclient.
266*** 182***
267*** 183***
268EOF 184EOF
269 if ($ns->version =~ /jcrossclient/) { 185 if ($ns->version =~ /jcrossclient/) {
270 # let them, for now 186 # let them, for now
… …
290 } 206 }
291 207
292 $ns->pl and return $ns->destroy; 208 $ns->pl and return $ns->destroy;
293 209
294 $ns->async (sub { 210 $ns->async (sub {
211 $Coro::current->{desc} = "addme init";
212
295 my ($user, $pass); 213 my ($user, $pass);
296 214
297 $ns->send_packet ("addme_success"); 215 $ns->send_packet ("addme_success");
298 216
299 for (;;) { 217 for (;;) {
… …
304 cf::NDI_BLUE 222 cf::NDI_BLUE
305 ); 223 );
306 224
307 # read username 225 # read username
308 while () { 226 while () {
309 $user = query $ns, 0, "What is your name?\n:"; 227 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
310 228
311 if ($cf::LOGIN_LOCK{$user}) { 229 if ($cf::LOGIN_LOCK{$user}) {
312 $ns->send_drawinfo ( 230 $ns->send_drawinfo (
313 "That username is currently used in another login session. " 231 "That username is currently used in another login session. "
314 . "Chose another, or wait till the other session has ended.", 232 . "Chose another, or wait till the other session has ended.",
… …
322 . "(only a-z, A-Z and 0-9 are allowed), " 240 . "(only a-z, A-Z and 0-9 are allowed), "
323 . "or is not between 3 and 18 characters in length.", 241 . "or is not between 3 and 18 characters in length.",
324 cf::NDI_RED 242 cf::NDI_RED
325 ); 243 );
326 } 244 }
245 Coro::Timer::sleep 0.4;
327 } 246 }
328 247
329 check_playing $ns, $user and next; 248 check_playing $ns, $user and next;
249
250 $Coro::current->{desc} = "addme($user) pass";
330 251
331 $ns->send_drawinfo ( 252 $ns->send_drawinfo (
332 "Welcome $user, please enter your password now. " 253 "Welcome $user, please enter your password now. "
333 . "New users should now choose a password. " 254 . "New users should now choose a password. "
334 . "Anything your client lets you enter is fine.", 255 . "Anything your client lets you enter is fine.",
… …
342 $ns->send_drawinfo ( 263 $ns->send_drawinfo (
343 "Try to use at least three characters as your password please, " 264 "Try to use at least three characters as your password please, "
344 . "that cannot be too much to ask for :)", 265 . "that cannot be too much to ask for :)",
345 cf::NDI_RED 266 cf::NDI_RED
346 ); 267 );
268 Coro::Timer::sleep 0.4;
347 } 269 }
348 270
349 # lock this username for the remainder of this login session 271 # lock this username for the remainder of this login session
350 if ($cf::LOGIN_LOCK{$user}) { 272 if ($cf::LOGIN_LOCK{$user}) {
351 $ns->send_drawinfo ( 273 $ns->send_drawinfo (
… …
357 } 279 }
358 local $cf::LOGIN_LOCK{$user} = 1; 280 local $cf::LOGIN_LOCK{$user} = 1;
359 281
360 check_playing $ns, $user and next; 282 check_playing $ns, $user and next;
361 283
284 $Coro::current->{desc} = "addme($user) check";
285
362 # try to read the user file and check the password 286 # try to read the user file and check the password
363 if (my $pl = cf::player::find $user) { 287 if (my $pl = cf::player::find $user) {
364 aio_stat $pl->path and next; 288 aio_stat $pl->path and next;
365 my $mtime = (stat _)[9]; 289 my $mtime = (stat _)[9];
366 my $hash = $pl->password; 290 my $hash = $pl->password;
… …
368 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 292 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
369 nuke_str $pass; 293 nuke_str $pass;
370 # password matches, wonderful 294 # password matches, wonderful
371 my $pl = cf::player::find $user or next; 295 my $pl = cf::player::find $user or next;
372 $pl->connect ($ns); 296 $pl->connect ($ns);
297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
373 enter_map $pl; 298 enter_map $pl;
374 last; 299 last;
375 } elsif (can_cleanup $pl, $mtime) { 300 } elsif (can_cleanup $pl, $mtime) {
376 Coro::Timer::sleep 1; 301 Coro::Timer::sleep 1;
377 302
… …
419 next; 344 next;
420 } 345 }
421 } 346 }
422 347
423 # the rest of this function is character creation 348 # the rest of this function is character creation
349 $Coro::current->{desc} = "addme($user) chargen";
424 350
425 # just to make sure nothing is left over 351 # just to make sure nothing is left over
426 nuke_playerdir $user; 352 nuke_playerdir $user;
427 353
428 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 354 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
432 nuke_str $pass2; 358 nuke_str $pass2;
433 $ns->send_drawinfo ( 359 $ns->send_drawinfo (
434 "The passwords do not match, please try again.", 360 "The passwords do not match, please try again.",
435 cf::NDI_RED 361 cf::NDI_RED
436 ); 362 );
363 Coro::Timer::sleep 0.5;
437 next; 364 next;
438 } 365 }
439 366
440 nuke_str $pass2; 367 nuke_str $pass2;
441 368
… …
463 $ob->swap_stats ($res - 1, $swap - 1); 390 $ob->swap_stats ($res - 1, $swap - 1);
464 } 391 }
465 } else { 392 } else {
466 $ob->roll_stats; 393 $ob->roll_stats;
467 } 394 }
395
396 Coro::Timer::sleep 0.05;
468 } 397 }
469 398
470 $ob->set_animation (2); 399 $ob->set_animation (2);
471 $ob->add_statbonus; 400 $ob->add_statbonus;
472 401
473 while () { 402 while () {
474 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 403 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
475 my $msg = $ob->msg; 404 my $msg = $ob->msg;
476 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 405 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
477 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 406 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
478 407
479 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 408 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
480 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 409 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
481 410
482 last if $res =~ /[dD]/; 411 last if $res =~ /[dD]/;
483 412
484 $pl->chargen_race_next; 413 $pl->chargen_race_next;
414 Coro::Timer::sleep 0.2;
485 } 415 }
486 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;
487 $pl->chargen_race_done; 420 $pl->chargen_race_done;
488 421
489 while () { 422 while () {
490 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 423 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
491 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 424 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
… …
495 last; 428 last;
496 } elsif ($res =~ /^[mM]/) { 429 } elsif ($res =~ /^[mM]/) {
497 $pl->gender (0); 430 $pl->gender (0);
498 last; 431 last;
499 } 432 }
433 Coro::Timer::sleep 0.2;
500 } 434 }
501 435
502 $ob->reply (undef, "Welcome to Crossfire!"); 436 $ob->reply (undef, "Welcome to Deliantra!");
503 437
504 delete $pl->{deny_save}; 438 delete $pl->{deny_save};
505 439
506 last; 440 last;
507 } 441 }
508 }); 442 });
509} 443});
510 444
511cf::register_command quit => sub { 445cf::register_command quit => sub {
512 my ($ob, $arg) = @_; 446 my ($ob, $arg) = @_;
513 447
514 $ob->reply (undef, 448 $ob->reply (undef,
… …
548 482
549 # update respawn position 483 # update respawn position
550 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 484 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
551 cf::async { $pl->save }; 485 cf::async { $pl->save };
552 486
553 $pl->killer ("left"); 487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
554 $ob->check_score; 488 $ob->check_score;
555 489
556 $ob->reply (undef, "In the future, you will wake up here when you die."); 490 $ob->reply (undef, "In the future, you will wake up here when you die.");
557 491
558 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 492 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
… …
580 514
581 if ($cleanly) { 515 if ($cleanly) {
582 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 516 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
583 } else { 517 } else {
584 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 518 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
585 $pl->{unclean_save} = $cf::RUNTIME; 519 $pl->{unclean_save} = $cf::RUNTIME
520 unless safe_spot $pl;
586 } 521 }
587 }, 522 },
588); 523);
589 524
590cf::client->attach (
591 on_addme => \&addme,
592 on_setup => \&setup,
593);
594
595############################################################################# 525#############################################################################
596 526
597our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 527our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
598our $SAVE_TIMEOUT = 20; # save players every n seconds 528our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
599 529
600our $SCHEDULER = cf::async_ext { 530our $SCHEDULER = cf::async_ext {
601 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 531 $Coro::current->{desc} = "player scheduler";
532
602 while () { 533 while () {
603 $schedule_interval->next; 534 Coro::EV::timer_once $SCHEDULE_INTERVAL;
604 535
605 # this weird form of iteration over values is used because 536 # this weird form of iteration over values is used because
606 # the hash changes underneath us frequently, and for 537 # the hash changes underneath us frequently, and for
607 # keeps a direct reference to the value without (in 5.8 perls) 538 # keeps a direct reference to the value without (in 5.8 perls)
608 # keeping a reference, so this is prone to crashes or worse. 539 # keeping a reference, so this is prone to crashes or worse.
… …
612 or next; 543 or next;
613 $pl->valid or next; 544 $pl->valid or next;
614 545
615 eval { 546 eval {
616 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 547 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
617 cf::wait_for_tick_begin;
618 $pl->save; 548 $pl->save;
619 549
620 unless ($pl->active || $pl->ns) { 550 unless ($pl->active || $pl->ns) {
621 # check refcounts, this is tricky and needs to be adjusted to fit server internals 551 # check refcounts, this is tricky and needs to be adjusted to fit server internals
622 my $ob = $pl->ob; 552 my $ob = $pl->ob;
… …
636 $pl->destroy; # destroys $ob 566 $pl->destroy; # destroys $ob
637 } else { 567 } else {
638 my $a_ = $pl->refcnt;#d# 568 my $a_ = $pl->refcnt;#d#
639 my $b_ = $ob->refcnt;#d# 569 my $b_ = $ob->refcnt;#d#
640 570
641 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d# 571 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
642 } 572 }
643 } 573 }
644 } 574 }
645 }; 575 };
646 warn $@ if $@; 576 warn $@ if $@;
647 Coro::cede; 577 cf::cede_to_tick;
648 }; 578 };
649 } 579 }
650}; 580};
651 581
652$SCHEDULER->prio (1); 582$SCHEDULER->prio (1);

Diff Legend

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