timer better resets itself

vlggms · Apr 28, 2024 · e16ebb8 · e16ebb8
1 parent 8bdced2
commit e16ebb8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -570,7 +570,9 @@
 	if(!client && AIStatus == AI_ON && target && !attack_is_on_cooldown)
 		TryAttack()
 
-/mob/living/simple_animal/hostile/proc/TryAttack()
+/mob/living/simple_animal/hostile/proc/TryAttack(called_by_timer = FALSE)
+	if(called_by_timer)
+		attack_timer_id = null
 	if(client || stat != CONSCIOUS || AIStatus != AI_ON || incapacitated() || !targets_from || !isturf(targets_from.loc))
 		attack_is_on_cooldown = FALSE
 		if(attack_timer_id)
@@ -598,7 +600,7 @@
 		else
 			attack_is_on_cooldown = FALSE
 	if(!attack_timer_id)
-		attack_timer_id = addtimer(CALLBACK(src, PROC_REF(TryAttack)), attack_cooldown, TIMER_STOPPABLE)
+		attack_timer_id = addtimer(CALLBACK(src, PROC_REF(TryAttack), TRUE), attack_cooldown, TIMER_STOPPABLE)
 
 	// Called by automated_action and causes the AI to go idle if it returns false. This proc is pretty big.
 /mob/living/simple_animal/hostile/proc/MoveToTarget(list/possible_targets)