summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index b068a275c..07b0bb6f8 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8867,8 +8867,6 @@ int skill_delayfix (struct block_list *bl, int skill_id, int skill_lv)
if (time < 0)
time = -time + status_get_amotion(bl); // If set to <0, add to attack motion.
- else if (time == 0)
- time = status_get_amotion(bl); // Use amotion
// Delay reductions
switch (skill_id)
@@ -8927,6 +8925,9 @@ int skill_delayfix (struct block_list *bl, int skill_id, int skill_lv)
if (battle_config.delay_rate != 100)
time = time * battle_config.delay_rate / 100;
+ if (time < status_get_amotion(bl))
+ time = status_get_amotion(bl); // Delay can never be below amotion [Playtester]
+
return max(time, battle_config.min_skill_delay_limit);
}