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.17 by root, Mon Jan 8 14:11:05 2007 UTC vs.
Revision 1.88 by root, Sun Aug 17 22:46:26 2008 UTC

1#! perl 1#! perl # mandatory
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7 7
8my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; 8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
9 9
10# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
11sub nuke_str { 11sub nuke_str {
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
13} 13}
14 14
15sub query { 15sub query {
16 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
17 17
18 my $current = $Coro::current; 18 my $current = $Coro::current;
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0]; }); 19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] });
20 Coro::schedule while ref $current; 20 Coro::schedule while ref $current;
21 21
22 $current 22 $current
23} 23}
24 24
25sub can_cleanup { 25sub can_cleanup {
26 my ($playerfile, $mtime) = @_; 26 my ($pl, $mtime) = @_;
27 27
28 my $age = time - $mtime; 28 my $age = time - $mtime;
29 my $level = $playerfile =~ /^level (\d+)$/m ? $1 : return; 29 my $level = $pl->ob->level;
30 30
31 ($level <= 3 && $age > 7 * 86400) # 7 days for level 0..3 31 ($level <= 3 && $age > 7 * 86400) # 7 days for level 0..3
32 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9 32 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9
33 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20 33 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20
34 || $age > 700 * 86400 # 2 years for everybody else 34 || $age > 700 * 86400 # 2 years for everybody else
40 return unless cf::player::find_active $user; 40 return unless cf::player::find_active $user;
41 41
42 $ns->send_drawinfo ( 42 $ns->send_drawinfo (
43 "That player is already logged in on this server. " 43 "That player is already logged in on this server. "
44 . "If you want to create a new player, choose another name. " 44 . "If you want to create a new player, choose another name. "
45 . "If you are already a registered player, make sure nobody " 45 . "If you have already a registered, make sure nobody "
46 . "else is using your account at this time. If you lost your conenction " 46 . "else is using your account at this time. If you lost your connection "
47 . "then the server will likely timeout within a minute. If you still " 47 . "then the server will likely timeout within a minute. If you still "
48 . "cannot log-in after a minute, you are still logged in. Make sure " 48 . "cannot log-in after a minute, you are still logged in. Make sure "
49 . "you do not have another client running. If you use windows, reboot, " 49 . "you do not have another client running. If you use windows, reboot, "
50 . "this will fix anything.", 50 . "this will fix anything.",
51 cf::NDI_RED 51 cf::NDI_RED
52 ); 52 );
53 53
54 1 54 1
55} 55}
56 56
57sub check_clean_save { 57sub safe_spot($) {
58 my ($pl) = @_; 58 my ($pl) = @_;
59
60 my $ob = $pl->ob;
59 61
60 unless (delete $pl->{clean_save}) { 62 my $m = $ob->map
61 #d#TODO 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
75sub enter_map {
76 my ($pl) = @_;
77
78 warn $pl->ob->name, ": enter map 1\n";#d#
79 my $ob = $pl->ob;
80
81 my ($map, $x, $y)
82 = $ob->{_link_pos}
83 ? @{delete $ob->{_link_pos}}
84 : ($pl->maplevel, $ob->x, $ob->y);
85
86 warn $pl->ob->name, ": enter map 2\n";#d#
87 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
89
90 my $m = cf::map::find $map;
91 my $time = delete $pl->{unclean_save};
92 warn $pl->ob->name, ": enter map 4\n";#d#
93
94 if ($time && $m) {
95 if ($time < $m->{instantiate_time}) {
96 # the map was reset in the meantime
97 my $age = $cf::RUNTIME - $time;
98
99 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
100
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 {
114 ($map, $x, $y) = $pl->savebed;
115
116 $ob->message (
117 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
118 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
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.>",
121 cf::NDI_RED
122 );
123 }
124 } else {
125 $ob->message (
126 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
127 . "as lots of things could happen when you leave by other means, such as cave-ins, "
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.>",
130 cf::NDI_RED
131 );
132 }
62 } 133 }
134
135 warn $pl->ob->name, ": enter map 5\n";#d#
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
63} 145}
64 146
65# delete a player directory, be non-blocking AND synchronous... 147# delete a player directory, be non-blocking AND synchronous...
66# (thats hard, so we crap out and fork). 148# (thats hard, so we crap out and fork).
67sub nuke_playerdir { 149sub nuke_playerdir {
68 my ($user) = @_; 150 my ($user) = @_;
69 151
70 aio_stat "$PLAYERDIR/$user"; 152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
71 system "cd \Q$PLAYERDIR\E "
72 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
73 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
74}
75 153
76sub addme { 154 cf::fork_call {
155 rename "$PLAYERDIR/$user", $temp;
156 system "rm", "-rf", $temp;
157 };
158}
159
160cf::client->attach (on_addme => sub {
77 my ($ns) = @_; 161 my ($ns) = @_;
78 162
79 $ns->destroy if $ns->pl; 163 if (!$ns->facecache)
164 {
165 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
166
167
168***
169*** WARNING:
170*** Your client does not support face/image caching,
171*** or it has been disabled. Face caching is mandatory
172*** so please enable it or use a newer client.
173***
174*** Look at your client preferences:
175***
176*** deliantra: all known versions automatically enable the facecache.
177*** cfclient: use the -cache commandline option.
178*** cfclient: map will not redraw automatically (bug).
179*** gcfclient: use -cache commandline option, or enable
180*** gcfclient: Client => Configure => Map & Image => Cache Images.
181*** jcrossclient: your client is broken, use deliantra or gcfclient.
182***
183***
184EOF
185 if ($ns->version =~ /jcrossclient/) {
186 # let them, for now
187 } else {
188 $ns->flush;
189 return $ns->destroy;
190 }
191
192 # $ns->facecache = true;
193 }
194
195 if ($ns->mapmode < cf::Map1aCmd) {
196 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
197
198
199***
200*** WARNING:
201*** Your client is too old. Please upgrade to a newer version.
202EOF
203
204 $ns->flush;
205 return $ns->destroy;
206 }
207
208 $ns->pl and return $ns->destroy;
80 209
81 $ns->async (sub { 210 $ns->async (sub {
211 $Coro::current->{desc} = "addme init";
212
82 my ($user, $pass); 213 my ($user, $pass);
83 214
84 $ns->send_packet ("addme_success"); 215 $ns->send_packet ("addme_success");
85 216
86 for (;;) { 217 for (;;) {
99 $ns->send_drawinfo ( 230 $ns->send_drawinfo (
100 "That username is currently used in another login session. " 231 "That username is currently used in another login session. "
101 . "Chose another, or wait till the other session has ended.", 232 . "Chose another, or wait till the other session has ended.",
102 cf::NDI_RED 233 cf::NDI_RED
103 ); 234 );
104 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}$/) { 235 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) {
105 last; 236 last;
106 } else { 237 } else {
107 $ns->send_drawinfo ( 238 $ns->send_drawinfo (
108 "Your username contains illegal characters " 239 "Your username contains illegal characters "
109 . "(only a-z, A-Z and 0-9 are allowed), " 240 . "(only a-z, A-Z and 0-9 are allowed), "
110 . "or is not between 3 and 18 characters in length.", 241 . "or is not between 3 and 18 characters in length.",
111 cf::NDI_RED 242 cf::NDI_RED
112 ); 243 );
113 } 244 }
245 Coro::Timer::sleep 0.4;
114 } 246 }
115 247
116 check_playing $ns, $user and next; 248 check_playing $ns, $user and next;
249
250 $Coro::current->{desc} = "addme($user) pass";
117 251
118 $ns->send_drawinfo ( 252 $ns->send_drawinfo (
119 "Welcome $user, please enter your password now. " 253 "Welcome $user, please enter your password now. "
120 . "New users should now choose a password. " 254 . "New users should now choose a password. "
121 . "Anything your client lets you enter is fine.", 255 . "Anything your client lets you enter is fine.",
129 $ns->send_drawinfo ( 263 $ns->send_drawinfo (
130 "Try to use at least three characters as your password please, " 264 "Try to use at least three characters as your password please, "
131 . "that cannot be too much to ask for :)", 265 . "that cannot be too much to ask for :)",
132 cf::NDI_RED 266 cf::NDI_RED
133 ); 267 );
268 Coro::Timer::sleep 0.4;
134 } 269 }
135 270
136 # lock this username for the remainder of this login session 271 # lock this username for the remainder of this login session
137 if ($cf::LOGIN_LOCK{$user}) { 272 if ($cf::LOGIN_LOCK{$user}) {
138 $ns->send_drawinfo ( 273 $ns->send_drawinfo (
144 } 279 }
145 local $cf::LOGIN_LOCK{$user} = 1; 280 local $cf::LOGIN_LOCK{$user} = 1;
146 281
147 check_playing $ns, $user and next; 282 check_playing $ns, $user and next;
148 283
284 $Coro::current->{desc} = "addme($user) check";
285
149 # try to read the user file and check the password 286 # try to read the user file and check the password
150 if (my $fh = aio_open cf::player::path $user, O_RDONLY, 0) { 287 if (my $pl = cf::player::find $user) {
288 aio_stat $pl->path and next;
151 my $mtime = (stat $fh)[9]; 289 my $mtime = (stat _)[9];
152
153 0 < aio_read $fh, 0, 16384, my $buf, 0 or next;
154 $buf =~ /^password (\S+)$/m or next;
155 my $hash = $1; 290 my $hash = $pl->password;
156 291
157 if ($hash eq crypt $pass, $hash) { 292 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
158 nuke_str $pass; 293 nuke_str $pass;
159 # password matches, wonderful 294 # password matches, wonderful
160 my $pl = cf::player::find $user or next; 295 my $pl = cf::player::find $user or next;
161 $pl->connect ($ns); 296 $pl->connect ($ns);
162 check_clean_save $pl; 297 enter_map $pl;
163 $pl->{clean_save} = 1;
164 last; 298 last;
165 } elsif (can_cleanup $buf, $mtime) { 299 } elsif (can_cleanup $pl, $mtime) {
166 Coro::Timer::sleep 1; 300 Coro::Timer::sleep 1;
167 301
168 $ns->send_drawinfo ( 302 $ns->send_drawinfo (
169 "Player exists, but password does not match. If this is your account, " 303 "Player exists, but password does not match. If this is your account, "
170 . "please try again. If not, you can now decide to take over this account " 304 . "please try again. If not, you can now decide to take over this account "
178 312
179 # check if the file hasn't changed 313 # check if the file hasn't changed
180 aio_stat cf::player::path $user and next; 314 aio_stat cf::player::path $user and next;
181 $mtime == (stat _)[9] or next; 315 $mtime == (stat _)[9] or next;
182 316
183 nuke_playerdir $user; 317 $pl->quit_character;
184 318
185 # fall through to creation 319 # fall through to creation
186 } else { 320 } else {
187 nuke_str $pass; 321 nuke_str $pass;
188 322
193 . "(check for Numlock and other semi-obvious error sources).", 327 . "(check for Numlock and other semi-obvious error sources).",
194 cf::NDI_RED 328 cf::NDI_RED
195 ); 329 );
196 next; 330 next;
197 } 331 }
332 } else {
333 # unable to load the playerfile:
334 # check wether the player dir exists, which means the file is corrupted or
335 # something very similar.
336 if (!aio_stat cf::player::playerdir $user) {
337 $ns->send_drawinfo (
338 "Unable to retrieve this player. It might be a locked or broken account. "
339 . "If this is your account, ask a dungeon master for assistance. "
340 . "Otherwise choose a different login name.",
341 cf::NDI_RED
342 );
343 next;
344 }
198 } 345 }
199 346
200 # the rest of this function is character creation 347 # the rest of this function is character creation
348 $Coro::current->{desc} = "addme($user) chargen";
201 349
202 # just to make sure nothing is left over 350 # just to make sure nothing is left over
203 nuke_playerdir $user; 351 nuke_playerdir $user;
204 352
205 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 353 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
209 nuke_str $pass2; 357 nuke_str $pass2;
210 $ns->send_drawinfo ( 358 $ns->send_drawinfo (
211 "The passwords do not match, please try again.", 359 "The passwords do not match, please try again.",
212 cf::NDI_RED 360 cf::NDI_RED
213 ); 361 );
362 Coro::Timer::sleep 0.5;
214 next; 363 next;
215 } 364 }
216 365
217 nuke_str $pass2; 366 nuke_str $pass2;
218 367
219 my $pl = cf::player::new $user; 368 my $pl = cf::player::new $user;
220 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 369 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
221 nuke_str $pass; 370 nuke_str $pass;
222 $pl->connect ($ns); 371 $pl->connect ($ns);
223
224 my $ob = $pl->ob; 372 my $ob = $pl->ob;
373
374 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
225 375
226 while () { 376 while () {
227 $ob->update_stats; 377 $ob->update_stats;
228 $pl->save_stats; 378 $pl->save_stats;
229 379
239 $ob->swap_stats ($res - 1, $swap - 1); 389 $ob->swap_stats ($res - 1, $swap - 1);
240 } 390 }
241 } else { 391 } else {
242 $ob->roll_stats; 392 $ob->roll_stats;
243 } 393 }
394
395 Coro::Timer::sleep 0.05;
244 } 396 }
245 397
246 $ob->set_animation (2); 398 $ob->set_animation (2);
247 $ob->add_statbonus; 399 $ob->add_statbonus;
248 400
249 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 401 while () {
250 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 402 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
403 my $msg = $ob->msg;
404 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
405 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
406
407 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
251 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 408 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
252 409
253 $ns->state (cf::ST_CHANGE_CLASS); 410 last if $res =~ /[dD]/;
411
412 $pl->chargen_race_next;
413 Coro::Timer::sleep 0.2;
414 }
415
416 # create the playerdir, if necessary, as chargen_race_done did it before
417 # presumably because of unique maps
418 aio_mkdir playerdir $pl, 0770;
419 $pl->chargen_race_done;
420
421 while () {
422 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
423 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
424
425 if ($res =~ /^[fF]/) {
426 $pl->gender (1);
427 last;
428 } elsif ($res =~ /^[mM]/) {
429 $pl->gender (0);
430 last;
431 }
432 Coro::Timer::sleep 0.2;
433 }
434
435 $ob->reply (undef, "Welcome to Deliantra!");
436
254 delete $pl->{deny_save};#d# too early 437 delete $pl->{deny_save};
255 438
256 last; 439 last;
257 } 440 }
258 }); 441 });
259} 442});
260 443
261cf::register_command quit => sub { 444cf::register_command quit => sub {
262 my ($ob, $arg) = @_; 445 my ($ob, $arg) = @_;
263 446
264 $ob->reply (undef, 447 $ob->reply (undef,
280 } else { 463 } else {
281 $ob->reply (undef, 464 $ob->reply (undef,
282 "Ok, quitting, hope to see you again.", 465 "Ok, quitting, hope to see you again.",
283 cf::NDI_UNIQUE | cf::NDI_RED); 466 cf::NDI_UNIQUE | cf::NDI_RED);
284 $pl->ns->flush; 467 $pl->ns->flush;
285 $pl->quit_character; 468 cf::async { $pl->quit_character };
286 } 469 }
287 }); 470 });
288}; 471};
289 472
290cf::object->attach ( 473cf::object->attach (
296 479
297 my $pl = $ob->contr; 480 my $pl = $ob->contr;
298 481
299 # update respawn position 482 # update respawn position
300 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 483 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
484 cf::async { $pl->save };
301 485
302 $pl->killer ("left"); 486 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
303 $ob->check_score; 487 $ob->check_score;
304 488
305 $ob->reply (undef, "In the future, you will wake up here when you die."); 489 $ob->reply (undef, "In the future, you will wake up here when you die.");
306 490
307 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 491 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
329 513
330 if ($cleanly) { 514 if ($cleanly) {
331 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 515 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
332 } else { 516 } else {
333 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 517 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
334 delete $pl->{clean_save}; 518 $pl->{unclean_save} = $cf::RUNTIME
519 unless safe_spot $pl;
335 } 520 }
336 }, 521 },
337); 522);
338 523
339cf::client->attach (
340 on_addme => \&addme,
341);
342
343############################################################################# 524#############################################################################
344 525
345our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 526our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
346our $SAVE_TIMEOUT = 200; # save players every n seconds 527our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
347our $SAVE_INTERVAL = 0.1; # save at max. one player every $SAVE_INTERVAL
348 528
349our $SCHEDULER = cf::async_ext { 529our $SCHEDULER = cf::async_ext {
530 $Coro::current->{desc} = "player scheduler";
531
350 while () { 532 while () {
351 Coro::Timer::sleep $SCHEDULE_INTERVAL; 533 Coro::EV::timer_once $SCHEDULE_INTERVAL;
352 534
353 # this weird form of iteration over values is used because 535 # this weird form of iteration over values is used because
354 # the hash changes underneath us frequently, and for 536 # the hash changes underneath us frequently, and for
355 # keeps a direct reference to the value without (in 5.8 perls) 537 # keeps a direct reference to the value without (in 5.8 perls)
356 # keeping a reference, so this is prone to crashes or worse. 538 # keeping a reference, so this is prone to crashes or worse.
361 $pl->valid or next; 543 $pl->valid or next;
362 544
363 eval { 545 eval {
364 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 546 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
365 $pl->save; 547 $pl->save;
366 Coro::Timer::sleep $SAVE_INTERVAL;
367 }
368 548
369 unless ($pl->active) { 549 unless ($pl->active || $pl->ns) {
370 # check refcounts, this is tricky and needs to be adjusted to fit server internals 550 # check refcounts, this is tricky and needs to be adjusted to fit server internals
371 my $ob = $pl->ob; 551 my $ob = $pl->ob;
372 Scalar::Util::weaken $pl; 552
373 Scalar::Util::weaken $ob;
374 my $a_ = $pl->refcnt;
375 my $b_ = $ob->refcnt;
376 my $pl_ref = $pl->refcnt_cnt; 553 my $pl_ref = $pl->refcnt_cnt;
377 my $ob_ref = $ob->refcnt_cnt; 554 my $ob_ref = $ob->refcnt_cnt;
378 555
556 ## pl_ref == $pl + ob->contr + %cf::PLAYER
557 ## ob_ref == $ob + pl->observe + simply being an object
379 if ($pl_ref == 2 && $ob_ref == 1) { 558 if ($pl_ref == 3 && $ob_ref == 3) {
380 warn "player-scheduler destroy ", $ob->name;#d# 559 warn "player-scheduler destroy ", $ob->name;#d#
560
561 # remove from sight and get fresh "copies"
381 delete $cf::PLAYER{$ob->name}; 562 $pl = delete $cf::PLAYER{$ob->name};
382 # pl_ref == one from object + one from cf::PLAYER
383 # ob_ref == one from simply being an object
384 $ob->destroy; 563 $ob = $pl->ob;
564
385 $pl->destroy; 565 $pl->destroy; # destroys $ob
386 } else { 566 } else {
567 my $a_ = $pl->refcnt;#d#
568 my $b_ = $ob->refcnt;#d#
569
387 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 570 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
571 }
388 } 572 }
389 } 573 }
390 }; 574 };
391 warn $@ if $@; 575 warn $@ if $@;
392 Coro::cede; 576 cf::cede_to_tick;
393 }; 577 };
394 } 578 }
395}; 579};
396 580
397$SCHEDULER->prio (1); 581$SCHEDULER->prio (1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines