Skip to content

Commit

Permalink
Fixed haste effect which should ignore certain statuses.
Browse files Browse the repository at this point in the history
  • Loading branch information
MrKeiKun committed Jan 1, 2021
1 parent 198c785 commit ac0f906
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/map/status.c
Original file line number Diff line number Diff line change
Expand Up @@ -5875,10 +5875,6 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
val = max(val, sc->data[SC_STOMACHACHE]->val2);
if (sc->data[SC_MARSHOFABYSS]) // It stacks to other statuses so always put this at the end.
val = max(50, val + 10 * sc->data[SC_MARSHOFABYSS]->val1);
if (sc->data[SC_MOVHASTE_POTION]) { // Doesn't affect the movement speed by Quagmire, Decrease Agi, Slow Grace [Frost]
if (sc->data[SC_DEC_AGI] || sc->data[SC_QUAGMIRE] || sc->data[SC_DONTFORGETME])
return 0;
}
if (sc->data[SC_CATNIPPOWDER])
val = max(val, sc->data[SC_CATNIPPOWDER]->val3);

Expand Down Expand Up @@ -7571,6 +7567,12 @@ static int status_change_start_sub(struct block_list *src, struct block_list *bl
undead_flag = battle->check_undead(st->race, st->def_ele);
// Check for inmunities / sc fails
switch (type) {
case SC_DEC_AGI:
case SC_QUAGMIRE:
case SC_DONTFORGETME:
if (sc->data[SC_MOVHASTE_POTION])
return 0;
break;
case SC_DRUMBATTLE:
case SC_NIBELUNGEN:
case SC_INTOABYSS:
Expand Down

0 comments on commit ac0f906

Please sign in to comment.