diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/map/atcommand.c | 3 | ||||
-rw-r--r-- | src/map/script.c | 6 | ||||
-rw-r--r-- | src/map/skill.c | 4 |
3 files changed, 6 insertions, 7 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; diff --git a/src/map/skill.c b/src/map/skill.c index 4bf110b23..6eacde897 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -189,10 +189,6 @@ int skill_get_ele(int skill_id, int skill_lv) idx = skill->get_index(skill_id); Assert_retr(ELE_NEUTRAL, idx != 0); Assert_retr(ELE_NEUTRAL, skill_lv > 0); - if (skill_lv > MAX_SKILL_LEVEL) { - int val = skill->dbs->db[idx].element[skill_get_lvl_idx(skill_lv)]; - return skill_adjust_over_level(val, skill_lv, skill->dbs->db[idx].max); - } return skill->dbs->db[idx].element[skill_get_lvl_idx(skill_lv)]; } |