From 82a79bd0baebd69e48e459eb4a754d8ce9416ff3 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Fri, 23 Dec 2011 14:10:12 +0000 Subject: 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 --- src/map/battle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.3-70-g09d2