diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-13 11:44:14 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-13 11:44:14 +0000 |
| commit | 457e938b26c03a271c88ef768bd3d88d9f81e3fa (patch) | |
| tree | ab3e23915f326f35f2bddd874e7fd6e1c528ecfc /src/map/skill.c | |
| parent | 45e87f58af948434abe3603f0bd314ccef79fd49 (diff) | |
| download | hercules-457e938b26c03a271c88ef768bd3d88d9f81e3fa.tar.gz hercules-457e938b26c03a271c88ef768bd3d88d9f81e3fa.tar.bz2 hercules-457e938b26c03a271c88ef768bd3d88d9f81e3fa.tar.xz hercules-457e938b26c03a271c88ef768bd3d88d9f81e3fa.zip | |
Fixed effects being applied improperly in some rare cases.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13768 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 2e7a8016a..9f448cd10 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1789,7 +1789,10 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds { //Instant damage status_fix_damage(src,bl,damage,dmg.dmotion); //Deal damage before knockback to allow stuff like firewall+storm gust combo. if( (damage > 0 || attack_type&0xf000) && !status_isdead(bl) ) + { + if( damage > 0 ) attack_type &= ~0xf000; skill_additional_effect(src,bl,skillid,skilllv,attack_type,tick); + } if( damage > 0 ) //Counter status effects [Skotlex] skill_counter_additional_effect(dsrc,bl,skillid,skilllv,attack_type,tick); } |