summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 953eccc27..5bded2f3c 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -985,12 +985,13 @@ int npc_checknear(struct map_session_data *sd,int id)
return 0;
nd=(struct npc_data *)map_id2bl(id);
- if (nd==NULL || nd->bl.type!=BL_NPC) {
+ if (nd==NULL) {
if (battle_config.error_log)
ShowWarning("no such npc : %d\n",id);
return 1;
}
-
+ if (nd->bl.type!=BL_NPC) //Disguised character or something else...
+ return 1;
if (nd->class_<0) // イベント系は常にOK
return 0;