summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-17 04:07:05 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-17 04:07:05 +0000
commit296f8971239b8a4507288ec9f6973e9cf06dd9d5 (patch)
treec9c9b5d7e7634eb8728eb129e25d1f5fddfa7206 /src
parent56fcfb474d11b933e1ef074e0292c689f4df7b30 (diff)
downloadhercules-296f8971239b8a4507288ec9f6973e9cf06dd9d5.tar.gz
hercules-296f8971239b8a4507288ec9f6973e9cf06dd9d5.tar.bz2
hercules-296f8971239b8a4507288ec9f6973e9cf06dd9d5.tar.xz
hercules-296f8971239b8a4507288ec9f6973e9cf06dd9d5.zip
Trick Dead may now be canceled with provoke, bugreport:4612
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15143 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 0fa4dc944..7efdca2e6 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4593,6 +4593,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
if( tsc->data[SC_STONE] && tsc->opt1 == OPT1_STONE )
status_change_end(bl, SC_STONE, INVALID_TIMER);
status_change_end(bl, SC_SLEEP, INVALID_TIMER);
+ status_change_end(bl, SC_TRICKDEAD, INVALID_TIMER);
}
if( dstmd )