Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix snap_dodge setting not working for MO_EXTREMITYFIST #3241

Merged
merged 1 commit into from
Dec 26, 2023
Merged

Fix snap_dodge setting not working for MO_EXTREMITYFIST #3241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/map/battle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,10 @@ static int battle_delay_damage_sub(int tid, int64 tick, int id, intptr_t data)
if (target != NULL && !status->isdead(target)) {
//Check to see if you haven't teleported. [Skotlex]
if (src != NULL && (
battle_config.fix_warp_hit_delay_abuse ?
(dat->skill_id == MO_EXTREMITYFIST || target->m != src->m || check_distance_bl(src, target, dat->distance))
:
((target->type != BL_PC || BL_UCAST(BL_PC, target)->invincible_timer == INVALID_TIMER)
&& (dat->skill_id == MO_EXTREMITYFIST || (target->m == src->m && check_distance_bl(src, target, dat->distance))))
(dat->skill_id == MO_EXTREMITYFIST && (target->m != src->m || !battle_config.snap_dodge)) // Extremity fist always hits
|| (battle_config.fix_warp_hit_delay_abuse && target->m != src->m)
|| ((target->type != BL_PC || BL_UCAST(BL_PC, target)->invincible_timer == INVALID_TIMER)
&& (target->m == src->m && check_distance_bl(src, target, dat->distance)))
)) {
map->freeblock_lock();
status_fix_damage(src, target, dat->damage, dat->delay);
Expand Down
Loading