summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-06-06 18:19:17 -0300
committerEuphy <euphy@rathena.org>2013-06-15 15:39:53 -0400
commita016205274dcce516138b63ca863738fde463e0c (patch)
tree3eef0922e387acdc8d6aae5b5aa0f61cdb60b73d /src/map/pc.c
parente2cc127fb73876b87d8ca2699ed74df016e02b6c (diff)
downloadhercules-a016205274dcce516138b63ca863738fde463e0c.tar.gz
hercules-a016205274dcce516138b63ca863738fde463e0c.tar.bz2
hercules-a016205274dcce516138b63ca863738fde463e0c.tar.xz
hercules-a016205274dcce516138b63ca863738fde463e0c.zip
Follow up f754643911ebb19eb68fb7b6ad1a864b02d111a8
Special Thanks to lighta for pointing out an issue with that. Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 2587cfc8f..8d0194deb 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6637,7 +6637,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) {
duel_reject(sd->duel_invite, sd);
}
- if (sd->npc_id)
+ if (sd->npc_id && sd->st && sd->st->state != RUN)
npc_event_dequeue(sd);
pc_setglobalreg(sd,"PC_DIE_COUNTER",sd->die_counter+1);