summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-07 15:18:54 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-07 15:18:54 +0000
commita608dec02072f9b297bad8ae95e730751e4d84a9 (patch)
treeba83cab844d360e6cdbf230da5af0b69d87b0340 /src
parentc8062d07fe79e0cda2f60cd169c7d22a84926006 (diff)
downloadhercules-a608dec02072f9b297bad8ae95e730751e4d84a9.tar.gz
hercules-a608dec02072f9b297bad8ae95e730751e4d84a9.tar.bz2
hercules-a608dec02072f9b297bad8ae95e730751e4d84a9.tar.xz
hercules-a608dec02072f9b297bad8ae95e730751e4d84a9.zip
Magical damage reflection now works against boss monsters and only on target skill(but EarthQuake with one target is an exception).(bugreport:3026, bugreport:2527)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13857 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index cc141a0ed..56e90fd9e 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1630,8 +1630,9 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
}
}
- if (dmg.flag&BF_MAGIC) {
- if( !(sstatus->mode&MD_BOSS) && (dmg.damage || dmg.damage2) && skill_magic_reflect(src, bl, src==dsrc) )
+ if( dmg.flag&BF_MAGIC && ( skillid != NPC_EARTHQUAKE || (flag&0xFFF) == 1 ) )
+ { // Earthquake on multiple targets is not counted as a target skill. [Inkfish]
+ if( (dmg.damage || dmg.damage2) && skill_magic_reflect(src, bl, src==dsrc) )
{ //Magic reflection, switch caster/target
struct block_list *tbl = bl;
bl = src;