From 6f6a6b3db3b36846f68e6b8ccb59351dced66ab3 Mon Sep 17 00:00:00 2001 From: panikon Date: Fri, 11 Apr 2014 22:22:37 -0300 Subject: Fixed issue: 7694 http://hercules.ws/board/tracker/issue-7694-guild-notice/ Follow up to 7a5f7db Follow up to 4147d9f --- src/map/npc.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index 5f9422e9f..f872a6170 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1152,14 +1152,19 @@ int npc_click(struct map_session_data* sd, struct npc_data* nd) // another it's expected that the OnTouch event be put first in stack, because // unit_walktoxy_timer is executed before any other function in this case. // So it's best practice to put an 'end;' before OnTouch events in npcs that - // have view ids of mobs to avoid this kind of error [Panikon] + // have view ids of mobs to avoid this "issue" [Panikon] if (sd->npc_id != 0) { - ShowError("npc_click: npc_id != 0\n"); + // The player clicked a npc after entering an OnTouch area + if( sd->areanpc_id == sd->npc_id ); + else + ShowError("npc_click: npc_id != 0\n"); + return 1; } - if(!nd) return 1; - + if( !nd ) + return 1; + if ((nd = npc->checknear(sd,&nd->bl)) == NULL) return 1; -- cgit v1.2.3-60-g2f50