Fixed MIN_MOBLINKTIME not working (#6904)
This commit is contained in:
parent
5181c70626
commit
c127d2875b
@ -1019,7 +1019,7 @@ int mob_linksearch(struct block_list *bl,va_list ap)
|
|||||||
target = va_arg(ap, struct block_list *);
|
target = va_arg(ap, struct block_list *);
|
||||||
tick=va_arg(ap, t_tick);
|
tick=va_arg(ap, t_tick);
|
||||||
|
|
||||||
if (md->mob_id == mob_id && status_has_mode(&md->status,MD_ASSIST) && DIFF_TICK(md->last_linktime, tick) < MIN_MOBLINKTIME
|
if (md->mob_id == mob_id && status_has_mode(&md->status,MD_ASSIST) && DIFF_TICK(tick, md->last_linktime) >= MIN_MOBLINKTIME
|
||||||
&& !md->target_id)
|
&& !md->target_id)
|
||||||
{
|
{
|
||||||
md->last_linktime = tick;
|
md->last_linktime = tick;
|
||||||
@ -1481,7 +1481,7 @@ static int mob_ai_sub_hard_slavemob(struct mob_data *md,t_tick tick)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Avoid attempting to lock the master's target too often to avoid unnecessary overload. [Skotlex]
|
//Avoid attempting to lock the master's target too often to avoid unnecessary overload. [Skotlex]
|
||||||
if (DIFF_TICK(md->last_linktime, tick) < MIN_MOBLINKTIME && !md->target_id)
|
if (DIFF_TICK(tick, md->last_linktime) >= MIN_MOBLINKTIME && !md->target_id)
|
||||||
{
|
{
|
||||||
struct unit_data *ud = unit_bl2ud(bl);
|
struct unit_data *ud = unit_bl2ud(bl);
|
||||||
md->last_linktime = tick;
|
md->last_linktime = tick;
|
||||||
|
@ -2770,7 +2770,7 @@ static int unit_attack_timer_sub(struct block_list* src, int tid, t_tick tick)
|
|||||||
// Set mob's ANGRY/BERSERK states.
|
// Set mob's ANGRY/BERSERK states.
|
||||||
md->state.skillstate = md->state.aggressive?MSS_ANGRY:MSS_BERSERK;
|
md->state.skillstate = md->state.aggressive?MSS_ANGRY:MSS_BERSERK;
|
||||||
|
|
||||||
if (status_has_mode(sstatus,MD_ASSIST) && DIFF_TICK(md->last_linktime, tick) < MIN_MOBLINKTIME) {
|
if (status_has_mode(sstatus,MD_ASSIST) && DIFF_TICK(tick, md->last_linktime) >= MIN_MOBLINKTIME) {
|
||||||
// Link monsters nearby [Skotlex]
|
// Link monsters nearby [Skotlex]
|
||||||
md->last_linktime = tick;
|
md->last_linktime = tick;
|
||||||
map_foreachinrange(mob_linksearch, src, md->db->range2, BL_MOB, md->mob_id, target, tick);
|
map_foreachinrange(mob_linksearch, src, md->db->range2, BL_MOB, md->mob_id, target, tick);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user