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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/map.c b/src/map/map.c
index 222ada48a..ab2a13ec7 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1475,6 +1475,8 @@ int map_quit(struct map_session_data *sd) {
if(!sd->state.waitingdisconnect) {
+ if (sd->npc_timer_id != -1) //Cancel the event timer.
+ npc_timerevent_quit(sd);
if (sd->state.event_disconnect) {
if (script_config.event_script_type == 0) {
struct npc_data *npc;