summaryrefslogtreecommitdiff
path: root/src/map/map.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/map.c')
-rw-r--r--src/map/map.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/map.c b/src/map/map.c
index b58033f1f..fb488cf15 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1569,6 +1569,9 @@ int map_quit(struct map_session_data *sd)
if (sd->npc_timer_id != -1) //Cancel the event timer.
npc_timerevent_quit(sd);
+ if (sd->npc_id)
+ npc_event_dequeue(sd);
+
npc_script_event(sd, NPCE_LOGOUT);
//Unit_free handles clearing the player related data,