diff options
| author | GodLesZ <GodLesZ@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-23 09:36:27 +0000 |
|---|---|---|
| committer | GodLesZ <GodLesZ@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-23 09:36:27 +0000 |
| commit | a4a01f981ecd7f8bda6cddcd1d7b28ed13345cdd (patch) | |
| tree | 72f674f2205d43bc978ba7cecf43ef14ed02aee4 /src/map | |
| parent | 9d4b9083aa48835ee0f5a6084824ebdf402aceb4 (diff) | |
| download | hercules-a4a01f981ecd7f8bda6cddcd1d7b28ed13345cdd.tar.gz hercules-a4a01f981ecd7f8bda6cddcd1d7b28ed13345cdd.tar.bz2 hercules-a4a01f981ecd7f8bda6cddcd1d7b28ed13345cdd.tar.xz hercules-a4a01f981ecd7f8bda6cddcd1d7b28ed13345cdd.zip | |
follow up r15048, fix to bugreport:5151
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15224 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 2b79561f5..709ccd54e 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)) + if (battle_config.pk_mode && sd && bl->type == BL_PC && damage && !map_flag_gvg(sd->bl.m) && !map[sd->bl.m].flag.battleground) { if (flag & BF_SKILL) { //Skills get a different reduction than non-skills. [Skotlex] if (flag&BF_WEAPON) |