diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-05-03 12:37:38 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-05-03 12:37:38 +0000 |
| commit | 7e744fbd4fbf444adc163a52696fe3e67f4b699c (patch) | |
| tree | a0216549553253924135b72bb26d302c841a81bf /src/map/battle.c | |
| parent | e7e5d3d478f97a7015f6c4334d7d5258461af037 (diff) | |
| download | hercules-7e744fbd4fbf444adc163a52696fe3e67f4b699c.tar.gz hercules-7e744fbd4fbf444adc163a52696fe3e67f4b699c.tar.bz2 hercules-7e744fbd4fbf444adc163a52696fe3e67f4b699c.tar.xz hercules-7e744fbd4fbf444adc163a52696fe3e67f4b699c.zip | |
NPC_GUIDEDATTACK is not supposed to bypass pneuma/safetywall.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12687 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 96ba93259..d0d955719 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -289,7 +289,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i if (sc && sc->count) { //First, sc_*'s that reduce damage to 0. - if( sc->data[SC_SAFETYWALL] && (flag&(BF_SHORT|BF_MAGIC))==BF_SHORT && skill_num != NPC_GUIDEDATTACK ) + if( sc->data[SC_SAFETYWALL] && (flag&(BF_SHORT|BF_MAGIC))==BF_SHORT ) { struct skill_unit_group *group = (struct skill_unit_group *)sc->data[SC_SAFETYWALL]->val3; if (group) { @@ -300,7 +300,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i status_change_end(bl,SC_SAFETYWALL,-1); } - if( sc->data[SC_PNEUMA] && (flag&(BF_MAGIC|BF_LONG)) == BF_LONG && skill_num != NPC_GUIDEDATTACK ) + if( sc->data[SC_PNEUMA] && (flag&(BF_MAGIC|BF_LONG)) == BF_LONG ) return 0; if((sce=sc->data[SC_AUTOGUARD]) && flag&BF_WEAPON && |