From bb7c1805ba7ac572483d2abe66bbebfa752e28f2 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Fri, 9 Dec 2011 05:02:07 +0000 Subject: 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 --- src/map/battle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map') 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) -- cgit v1.2.3-70-g09d2