From 5e5321e2588f5bdc076bd4b40c5c585a8a02a56d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 2 Jun 2018 22:02:56 +0300 Subject: Fix map flag pvp_nocalcrank if use at or script command for enable pvp. Fixes #2056 --- src/map/atcommand.c | 3 ++- src/map/script.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/map') diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 290611c9b..ae0c776c6 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -1606,7 +1606,8 @@ int atcommand_pvpon_sub(struct block_list *bl,va_list ap) sd = BL_UCAST(BL_PC, bl); if (sd->pvp_timer == INVALID_TIMER) { - sd->pvp_timer = timer->add(timer->gettick() + 200, pc->calc_pvprank_timer, sd->bl.id, 0); + if (!map->list[sd->bl.m].flag.pvp_nocalcrank) + sd->pvp_timer = timer->add(timer->gettick() + 200, pc->calc_pvprank_timer, sd->bl.id, 0); sd->pvp_rank = 0; sd->pvp_lastusers = 0; sd->pvp_point = 5; diff --git a/src/map/script.c b/src/map/script.c index b9a826b93..e127c4f4f 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -13006,7 +13006,8 @@ int script_mapflag_pvp_sub(struct block_list *bl, va_list ap) sd = BL_UCAST(BL_PC, bl); if (sd->pvp_timer == INVALID_TIMER) { - sd->pvp_timer = timer->add(timer->gettick() + 200, pc->calc_pvprank_timer, sd->bl.id, 0); + if (!map->list[sd->bl.m].flag.pvp_nocalcrank) + sd->pvp_timer = timer->add(timer->gettick() + 200, pc->calc_pvprank_timer, sd->bl.id, 0); sd->pvp_rank = 0; sd->pvp_lastusers = 0; sd->pvp_point = 5; @@ -13245,7 +13246,8 @@ BUILDIN(pvpon) if( sd->bl.m != m || sd->pvp_timer != INVALID_TIMER ) continue; // not applicable - sd->pvp_timer = timer->add(timer->gettick()+200,pc->calc_pvprank_timer,sd->bl.id,0); + if (!map->list[m].flag.pvp_nocalcrank) + sd->pvp_timer = timer->add(timer->gettick()+200,pc->calc_pvprank_timer,sd->bl.id,0); sd->pvp_rank = 0; sd->pvp_lastusers = 0; sd->pvp_point = 5; -- cgit v1.2.3-60-g2f50