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

Added several check for OnTouch and OnTouch_ before running the event (#5009)

Browse Source 
* Check if the player is still in npc range
* Check if the player is still able to interact with the npc
* Check if the npc is cloaked
This commit is contained in:
Atemo
2020-05-27 15:52:37 +02:00
committed by GitHub
parent 0e42b738c5
commit 7efd696af7
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/map/npc.cpp
View File

@@ -989,6 +989,26 @@ int npc_event_sub(struct map_session_data* sd, struct event_data* ev, const char
npc_event_dequeue(sd);
return 2;
}
char ontouch_event_name[EVENT_NAME_LENGTH];
char ontouch2_event_name[EVENT_NAME_LENGTH];
safesnprintf(ontouch_event_name, ARRAYLENGTH(ontouch_event_name), "%s::%s", ev->nd->exname, script_config.ontouch_event_name);
safesnprintf(ontouch2_event_name, ARRAYLENGTH(ontouch2_event_name), "%s::%s", ev->nd->exname, script_config.ontouch2_event_name);
// recheck some conditions for OnTouch/OnTouch_
if (strcmp(eventname, ontouch_event_name) == 0 || strcmp(eventname, ontouch2_event_name) == 0) {
int xs = ev->nd->u.scr.xs;
int ys = ev->nd->u.scr.ys;
int x = ev->nd->bl.x;
int y = ev->nd->bl.y;
if (x > 0 && y > 0 && (xs > -1 && ys > -1) && ((sd->bl.x < x - xs) || (sd->bl.x > x + xs) || (sd->bl.y < y - ys) || (sd->bl.y > y + ys)) ||
(sd->state.block_action & PCBLOCK_NPCCLICK) || npc_is_cloaked(ev->nd, sd)) {
npc_event_dequeue(sd);
return 2;
}
}
run_script(ev->nd->u.scr.script,ev->pos,sd->bl.id,ev->nd->bl.id);
return 0;
}