diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-09 05:02:07 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-09 05:02:07 +0000 |
| commit | bb7c1805ba7ac572483d2abe66bbebfa752e28f2 (patch) | |
| tree | f032961ee3e90427cd7a05816acb9675bcd933e0 | |
| parent | df3833159ab72185999b4d912b6e93267d8b795e (diff) | |
| download | hercules-bb7c1805ba7ac572483d2abe66bbebfa752e28f2.tar.gz hercules-bb7c1805ba7ac572483d2abe66bbebfa752e28f2.tar.bz2 hercules-bb7c1805ba7ac572483d2abe66bbebfa752e28f2.tar.xz hercules-bb7c1805ba7ac572483d2abe66bbebfa752e28f2.zip | |
Fix to bugreport:2993 pk_mode damage reductions no longer stack with gvg ones
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15048 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -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 e12caaef8..8b0aa22fb 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -609,7 +609,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) + if (battle_config.pk_mode && sd && bl->type == BL_PC && damage && !map_flag_gvg(sd->bl.m)) { if (flag & BF_SKILL) { //Skills get a different reduction than non-skills. [Skotlex] if (flag&BF_WEAPON) |