diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/script.c | 37 |
2 files changed, 33 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 9495d50d1..5b17814e7 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -9,6 +9,8 @@ Date Added - Silenced truncation warnings in CR_ACIDDEMONSTRATION damage calculation and cardfix application (since r13700). - Reformatted unit_blown to make it look cleaner (follow up to r14492). * Labels longer than 23 characters will no longer cause the server to exit immediately (bugreport:4563, since r1213). [Ai4rei] + * Fixed script command getusers causing map server to crash when called with type 0 without attached character (bugreport:4565). [Ai4rei] + - Lack of character is now reported like other script commands do. Additionally invalid types are reported as well. 2010/11/22 * mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239). [Ai4rei] * Fixed a crash when shutting down char-server (TXT only), after it failed to load storage save data (since r1275). [Ai4rei] diff --git a/src/map/script.c b/src/map/script.c index 906dce510..c71debc0d 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -8220,13 +8220,38 @@ BUILDIN_FUNC(areaannounce) *------------------------------------------*/ BUILDIN_FUNC(getusers) { - int flag=script_getnum(st,2); - struct block_list *bl=map_id2bl((flag&0x08)?st->oid:st->rid); - int val=0; - switch(flag&0x07){ - case 0: val=map[bl->m].users; break; - case 1: val=map_getusers(); break; + int flag, val = 0; + struct map_session_data* sd; + struct block_list* bl = NULL; + + flag = script_getnum(st,2); + + if(flag&0x8) + {// npc + bl = map_id2bl(st->oid); } + else if((sd = script_rid2sd(st))!=NULL) + {// pc + bl = &sd->bl; + } + + switch(flag&0x07) + { + case 0: + if(bl) + { + val = map[bl->m].users; + } + break; + case 1: + val = map_getusers(); + break; + default: + ShowWarning("buildin_getusers: Unknown type %d.\n", flag); + script_pushint(st,0); + return 1; + } + script_pushint(st,val); return 0; } |