summaryrefslogtreecommitdiff
path: root/src/map/npc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/npc.cpp')
-rw-r--r--src/map/npc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index c4187c1..a40a4ec 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -622,7 +622,7 @@ int npc_event(dumb_ptr<map_session_data> sd, NpcEvent eventname,
&& (sd->bl_y < nd->bl_y - ys / 2 || nd->bl_y + ys / 2 < sd->bl_y))
return 1;
}
- if (sd->npc_id)
+ if (sd->npc_id && sd->npc_pos > -1 && args.size() < 1) // if called from a timer we process async, otherwise sync
{
sd->eventqueuel.push_back(eventname);
return 1;