From abb92350c0e1c8127a4b6bcb5faaad05b45ef0c5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 10 Sep 2022 15:02:55 -0400
Subject: [PATCH] Fixed strange smooth movement of fast ground units

---
 core/assets/logicids.dat                      | Bin 4633 -> 4617 bytes
 core/src/mindustry/ai/types/CommandAI.java    |   2 +-
 core/src/mindustry/io/MapIO.java              |   1 -
 .../world/blocks/distribution/Conveyor.java   |   2 +-
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index d0aa9226558a59301cefa72b3e40d2c432326950..99fbf56614dcdf26ba8689c06bcf9e8a0a371dd1 100644
GIT binary patch
delta 16
XcmbQK(y7A4@OvZEL*C7wdDU0|Gjs*!

delta 32
ncmeBFnW@6W@Mj~_LtcKq;*8AHoD|)pqSVCf)S}Igc-2_|y5<XZ

diff --git a/core/src/mindustry/ai/types/CommandAI.java b/core/src/mindustry/ai/types/CommandAI.java
index eb447c3498..3b60a7785f 100644
--- a/core/src/mindustry/ai/types/CommandAI.java
+++ b/core/src/mindustry/ai/types/CommandAI.java
@@ -127,7 +127,7 @@ public class CommandAI extends AIController{
                         attackTarget != null && unit.within(attackTarget, engageRange) ? engageRange :
                         unit.isGrounded() ? 0f :
                         attackTarget != null ? engageRange :
-                        0f, unit.isFlying() ? 40f : 100f, false, null, true);
+                        0f, unit.isFlying() ? 40f : 100f, false, null, targetPos.epsilonEquals(vecOut, 1f));
                 }
             }
 
diff --git a/core/src/mindustry/io/MapIO.java b/core/src/mindustry/io/MapIO.java
index c14107e106..172118097a 100644
--- a/core/src/mindustry/io/MapIO.java
+++ b/core/src/mindustry/io/MapIO.java
@@ -2,7 +2,6 @@ package mindustry.io;
 
 import arc.files.*;
 import arc.graphics.*;
-import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.io.*;
 import mindustry.content.*;
diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java
index 4c78ade6f0..b8e70f42f5 100644
--- a/core/src/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java
@@ -409,7 +409,7 @@ public class Conveyor extends Block implements Autotiler{
 
         @Override
         public Object senseObject(LAccess sensor){
-            if(sensor == LAccess.firstItem && len > 0) return ids[Math.max(0, len - 1)];
+            if(sensor == LAccess.firstItem && len > 0) return ids[len - 1];
             return super.senseObject(sensor);
         }