From c0f81a50ed6694343b277cd43fab4237ca4a6671 Mon Sep 17 00:00:00 2001
From: uwap <me@uwap.name>
Date: Sat, 3 Jan 2026 06:57:39 +0100
Subject: [PATCH] Fix some minor creep behaviour issues

---
 src/Workers/Clerk.ts       |  1 +
 src/Workers/Constructor.ts | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Workers/Clerk.ts b/src/Workers/Clerk.ts
index 3f7fed5..b89dc09 100644
--- a/src/Workers/Clerk.ts
+++ b/src/Workers/Clerk.ts
@@ -29,6 +29,7 @@ const assignTask = (creep: Creep) => {
         if (urgentRepair != null) {
           return Tasks.Repair(urgentRepair);
         }
+        return null;
       }
       return Tasks.Upgrade(creep.room.controller);
     }
diff --git a/src/Workers/Constructor.ts b/src/Workers/Constructor.ts
index 874cfd7..3b7a78f 100644
--- a/src/Workers/Constructor.ts
+++ b/src/Workers/Constructor.ts
@@ -20,8 +20,11 @@ const assignTask = (creep: Creep) => {
     }
   }
   else {
-    const urgentRepair = creep.pos.findClosestByRange(FIND_MY_STRUCTURES, {
-      filter: s => s.hits < s.hitsMax * 0.3,
+    const urgentRepair = creep.pos.findClosestByRange(FIND_STRUCTURES, {
+      filter: s => "my" in s
+        ? s.my
+        : s.structureType === STRUCTURE_CONTAINER
+          && s.hits < s.hitsMax * 0.3,
     });
     if (urgentRepair != null) {
       return Tasks.Repair(urgentRepair);
@@ -35,8 +38,7 @@ const assignTask = (creep: Creep) => {
       filter: s => s.hits < s.hitsMax * 0.8,
     }) ?? creep.pos.findClosestByRange(FIND_STRUCTURES, {
       filter: s => s.hits < s.hitsMax * 0.8
-        && (s.structureType === STRUCTURE_WALL
-          || s.structureType === STRUCTURE_ROAD),
+        && ("my" in s ? s.my : true),
     });
     if (structure != null) {
       return Tasks.Repair(structure);