summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2022-11-07 00:14:41 -0300
committerJesusaves <cpntb1@ymail.com>2022-11-07 00:14:41 -0300
commit36ac72a8178bab7f1802d67d13c4d91ebec3e88b (patch)
tree92cbab6835819bd062d47a048ba7356697fc0cdf
parente0d1737a0bb383ce7d8d5354e057e0cd35ccadcb (diff)
downloadhercules-36ac72a8178bab7f1802d67d13c4d91ebec3e88b.tar.gz
hercules-36ac72a8178bab7f1802d67d13c4d91ebec3e88b.tar.bz2
hercules-36ac72a8178bab7f1802d67d13c4d91ebec3e88b.tar.xz
hercules-36ac72a8178bab7f1802d67d13c4d91ebec3e88b.zip
[TMW2] Do not cancel running timers when you die.
-rw-r--r--src/map/pc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index e1da6f69d..952d89a21 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -8021,8 +8021,9 @@ static int pc_dead(struct map_session_data *sd, struct block_list *src)
duel->reject(sd->duel_invite, sd);
}
- if (sd->npc_id && sd->st && sd->st->state != RUN)
- npc->event_dequeue(sd);
+ // [TMW2] Do not dequeue events if you die (that's what ispcdead is for)
+ //if (sd->npc_id && sd->st && sd->st->state != RUN)
+ // npc->event_dequeue(sd);
pc_setglobalreg(sd,script->add_variable("PC_DIE_COUNTER"),sd->die_counter+1);
pc->setparam(sd, SP_KILLERRID, src?src->id:0);