diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-11-25 00:18:51 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-11-25 00:18:51 +0000 |
| commit | 8f6a6d949ee9f2fdeb85d1bb9348c7abc7c12af1 (patch) | |
| tree | a17c84eebfabf77f8156e41ecb6f3d4e8aca817f /src/map | |
| parent | 25ea5b250d182c5ec71a3bb4d742beca55b47bb6 (diff) | |
| download | hercules-8f6a6d949ee9f2fdeb85d1bb9348c7abc7c12af1.tar.gz hercules-8f6a6d949ee9f2fdeb85d1bb9348c7abc7c12af1.tar.bz2 hercules-8f6a6d949ee9f2fdeb85d1bb9348c7abc7c12af1.tar.xz hercules-8f6a6d949ee9f2fdeb85d1bb9348c7abc7c12af1.zip | |
Fixed damage doesn't cancel status changes.(followed up to r14164)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14169 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c index 78fcc742d..9b3482d83 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -669,7 +669,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s if( battle_config.invincible_nodamage && src && sc && sc->data[SC_INVINCIBLE] && !sc->data[SC_INVINCIBLEOFF] ) hp = 1; - if( hp && !(flag&1|8) ) { + if( hp && !(flag&(1|8)) ) { if( sc ) { struct status_change_entry *sce; if( (sce = sc->data[SC_DEVOTION]) && src && battle_getcurrentskill(src) != PA_PRESSURE ) |