diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-22 14:35:28 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-22 14:35:28 +0000 |
| commit | 7ec5611976e5b04a947cca187bbd33431d2df52c (patch) | |
| tree | 6ca0264fb9236c3c4c2b1063c539b06c4f2ff2fb /src/map/skill.c | |
| parent | 932c76a02329e9c1b40f2b3d134ef22c55c19243 (diff) | |
| download | hercules-7ec5611976e5b04a947cca187bbd33431d2df52c.tar.gz hercules-7ec5611976e5b04a947cca187bbd33431d2df52c.tar.bz2 hercules-7ec5611976e5b04a947cca187bbd33431d2df52c.tar.xz hercules-7ec5611976e5b04a947cca187bbd33431d2df52c.zip | |
- Reverted the battle_calc_return_damage code as the previous one was correct, ninja self-targetted skills CAN be reflected.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9689 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 4ead739b4..d79d9b4ae 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1930,8 +1930,8 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds damage = dmg.damage + dmg.damage2; - if (damage > 0 && src != bl && src == dsrc) - rdamage = battle_calc_return_damage(bl, skillid, &damage, dmg.flag); + if (damage > 0 && src != bl && src == dsrc && skillid != WS_CARTTERMINATION) // FIXME(?): Quick and dirty check, but HSCR does bypass Shield Reflect... so I make it bypass the whole reflect thing [DracoRPG] + rdamage = battle_calc_return_damage(bl, &damage, dmg.flag); //Skill hit type type=(skillid==0)?5:skill_get_hit(skillid); |