summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-20 04:27:19 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-20 04:27:19 +0000
commit71bc369df021675fbc4bbfb7b6e7a5c117fe507b (patch)
tree663632b61303d420d83d88f4fd8262b45a359fd1
parent89e3488e045e9d6b7718773ff843b2a1e3f6e2a0 (diff)
downloadhercules-71bc369df021675fbc4bbfb7b6e7a5c117fe507b.tar.gz
hercules-71bc369df021675fbc4bbfb7b6e7a5c117fe507b.tar.bz2
hercules-71bc369df021675fbc4bbfb7b6e7a5c117fe507b.tar.xz
hercules-71bc369df021675fbc4bbfb7b6e7a5c117fe507b.zip
fix to timer errors on tweakwon kicks, bugreport:4028
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15172 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/skill.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 80ecfd3dc..540c68d4c 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1928,7 +1928,8 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
{ //Extend combo time.
sce->val1 = skillid; //Update combo-skill
sce->val3 = skillid;
- delete_timer(sce->timer, status_change_timer);
+ if( sce->timer != INVALID_TIMER )
+ delete_timer(sce->timer, status_change_timer);
sce->timer = add_timer(tick+sce->val4, status_change_timer, src->id, SC_COMBO);
break;
}