From 4ec81b0669e094530b5646abb83a5bd8326fd316 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Wed, 24 Mar 2021 16:09:20 -0700
Subject: [PATCH 1/2] Make Repair Points affected by overdrive (#4985)

---
 core/src/mindustry/world/blocks/units/RepairPoint.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/world/blocks/units/RepairPoint.java b/core/src/mindustry/world/blocks/units/RepairPoint.java
index 905c1c63f7..b84ed1d119 100644
--- a/core/src/mindustry/world/blocks/units/RepairPoint.java
+++ b/core/src/mindustry/world/blocks/units/RepairPoint.java
@@ -102,8 +102,8 @@ public class RepairPoint extends Block{
             if(target != null && (target.dead() || target.dst(tile) - target.hitSize/2f > repairRadius || target.health() >= target.maxHealth())){
                 target = null;
             }else if(target != null && consValid()){
-                target.heal(repairSpeed * Time.delta * strength * efficiency());
-                rotation = Mathf.slerpDelta(rotation, angleTo(target), 0.5f);
+                target.heal(repairSpeed * strength * edelta());
+                rotation = Mathf.slerpDelta(rotation, angleTo(target), 0.5f * efficiency() * timeScale);
                 targetIsBeingRepaired = true;
             }
 

From 3336e6cdde0201a86369edf75fe7ddf0d82c3065 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Thu, 25 Mar 2021 14:52:35 +0100
Subject: [PATCH 2/2] Exclude derelict targets from Units.bestEnemy (#4990)

---
 core/src/mindustry/entities/Units.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java
index 49e33ec06b..88e458b30c 100644
--- a/core/src/mindustry/entities/Units.java
+++ b/core/src/mindustry/entities/Units.java
@@ -218,7 +218,7 @@ public class Units{
         cdist = 0f;
 
         nearbyEnemies(team, x - range, y - range, range*2f, range*2f, e -> {
-            if(e.dead() || !predicate.get(e) || !e.within(x, y, range + e.hitSize/2f)) return;
+            if(e.dead() || !predicate.get(e) || e.team == Team.derelict || !e.within(x, y, range + e.hitSize/2f)) return;
 
             float cost = sort.cost(e, x, y);
             if(result == null || cost < cdist){