diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-23 14:10:12 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-23 14:10:12 +0000 |
| commit | 82a79bd0baebd69e48e459eb4a754d8ce9416ff3 (patch) | |
| tree | 94fb73593951760924df1afa4a8709e5b711d265 /src/map | |
| parent | 7be9e2346666be2b35733992ce95fa8b592f9e5a (diff) | |
| download | hercules-82a79bd0baebd69e48e459eb4a754d8ce9416ff3.tar.gz hercules-82a79bd0baebd69e48e459eb4a754d8ce9416ff3.tar.bz2 hercules-82a79bd0baebd69e48e459eb4a754d8ce9416ff3.tar.xz hercules-82a79bd0baebd69e48e459eb4a754d8ce9416ff3.zip | |
Follow up r15224, being these map flags do not stack then we can check just for pvp rather than 2 (gvg&bg).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15229 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index ad53f8145..682020c23 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -617,7 +617,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag sc_start(bl,sc->data[SC_POISONINGWEAPON]->val2,100,sc->data[SC_POISONINGWEAPON]->val1,skill_get_time2(GC_POISONINGWEAPON,sc->data[SC_POISONINGWEAPON]->val1)); } - if (battle_config.pk_mode && sd && bl->type == BL_PC && damage && !map_flag_gvg(sd->bl.m) && !map[sd->bl.m].flag.battleground) + if (battle_config.pk_mode && sd && bl->type == BL_PC && damage && map[bl->m].flag.pvp) { if (flag & BF_SKILL) { //Skills get a different reduction than non-skills. [Skotlex] if (flag&BF_WEAPON) |