diff options
| author | Haru <haru@dotalux.com> | 2018-06-03 17:58:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-03 17:58:39 +0200 |
| commit | a3bc9ad7e70f2c626f78472eb12a8f7f2c79f83e (patch) | |
| tree | 2cdce8bad323d724479dbee51016690a44668886 | |
| parent | fa15bfc417cce6fd81dfa1333548624f84d0e370 (diff) | |
| parent | 5e5321e2588f5bdc076bd4b40c5c585a8a02a56d (diff) | |
| download | hercules-a3bc9ad7e70f2c626f78472eb12a8f7f2c79f83e.tar.gz hercules-a3bc9ad7e70f2c626f78472eb12a8f7f2c79f83e.tar.bz2 hercules-a3bc9ad7e70f2c626f78472eb12a8f7f2c79f83e.tar.xz hercules-a3bc9ad7e70f2c626f78472eb12a8f7f2c79f83e.zip | |
Merge pull request #2057 from 4144/pvptimer
Fix map flag pvp_nocalcrank if use at or script command for enable pvp.
| -rw-r--r-- | src/map/atcommand.c | 3 | ||||
| -rw-r--r-- | src/map/script.c | 6 |
2 files changed, 6 insertions, 3 deletions
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; |