Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow the player to stand on a cell occupied by disabled/hidden npc (#7154)

Browse Source 
Fixed #7153
This commit is contained in:
Atemo 2022-08-07 21:54:53 +02:00 committed by GitHub
parent e3c2db65c4
commit c5031982d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/map/map.cpp
View File

@ -559,6 +559,11 @@ int map_count_oncell(int16 m, int16 x, int16 y, int type, int flag)
if (type&~BL_MOB)
for( bl = mapdata->block[bx+by*mapdata->bxs] ; bl != NULL ; bl = bl->next )
if(bl->x == x && bl->y == y && bl->type&type) {
if (bl->type == BL_NPC) { // Don't count hidden or invisible npc. Cloaked npc are counted
npc_data *nd = BL_CAST(BL_NPC, bl);
if (nd && (nd->bl.m < 0 || nd->sc.option && nd->sc.option&(OPTION_HIDE|OPTION_INVISIBLE)))
continue;
}
if(flag&1) {
struct unit_data *ud = unit_bl2ud(bl);
if(!ud || ud->walktimer == INVALID_TIMER)