[MIRROR] Lil' fix to fishing hat PR. (#4833)

* [MIRROR] [NO GBP] Lil' fix to fishing hat PR. [MDB IGNORE] (#4121) [NO GBP] Lil' fix to fishing hat PR. (#85459) ## About The Pull Request I didn't remove or change a few copypasted lines. @Jacquerel. ## Why It's Good For The Game They won't flee otherwise. ## Changelog N/A Co-authored-by: Ghom <[email protected]> * [MIRROR] Lil' fix to fishing hat PR. --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: Ghom <[email protected]> Co-authored-by: StealsThePRs <[email protected]>
Fluffy-Frontier · Jul 31, 2024 · 8a82066 · 8a82066
1 parent 813021b
commit 8a82066
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm
@@ -10,8 +10,6 @@
 /datum/ai_planning_subtree/flee_target/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
 	. = ..()
 	var/atom/flee_from = controller.blackboard[target_key]
-	if (controller.blackboard[BB_BASIC_MOB_STOP_FLEEING] || QDELETED(flee_from))
-		return
 	if(!should_flee(controller, flee_from))
 		return
 	var/flee_distance = controller.blackboard[BB_BASIC_MOB_FLEE_DISTANCE] || DEFAULT_BASIC_FLEE_DISTANCE

diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm
@@ -47,9 +47,7 @@
 
 /datum/ai_planning_subtree/make_carp_rift/aggressive_teleport/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
 	var/atom/movable/target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]
-	if(QDELETED(target) || !controller.blackboard[BB_CARPS_FEAR_FISHERMAN] || !HAS_TRAIT(target, TRAIT_SCARY_FISHERMAN))
-		return ..()
-	if (controller.blackboard[BB_BASIC_MOB_STOP_FLEEING])
+	if(!QDELETED(target) && controller.blackboard[BB_CARPS_FEAR_FISHERMAN] && HAS_TRAIT(target, TRAIT_SCARY_FISHERMAN))
 		return
 	return ..()