From 7726d94566da7fd6e4da9163ecf0b2f90313e526 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <patrick@queztech.net>
Date: Tue, 31 Dec 2019 18:54:45 +0100
Subject: [PATCH] Revert "Stash failed collision preventer"

This reverts commit 0383d3b8d74e85528ae54f33610244857143d91c.
---
 core/src/mindustry/entities/type/Unit.java    |  2 +-
 .../entities/type/base/CraterUnit.java        | 37 ++-----------------
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/core/src/mindustry/entities/type/Unit.java b/core/src/mindustry/entities/type/Unit.java
index 4728733934..ab02f24c83 100644
--- a/core/src/mindustry/entities/type/Unit.java
+++ b/core/src/mindustry/entities/type/Unit.java
@@ -37,7 +37,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
     public static final float maxAbsVelocity = 127f / velocityPercision;
     public static final int noSpawner = Pos.get(-1, 1);
 
-    protected static final Vec2 moveVector = new Vec2();
+    private static final Vec2 moveVector = new Vec2();
 
     public float rotation;
 
diff --git a/core/src/mindustry/entities/type/base/CraterUnit.java b/core/src/mindustry/entities/type/base/CraterUnit.java
index c81a4aabf3..0a1cd2c09c 100644
--- a/core/src/mindustry/entities/type/base/CraterUnit.java
+++ b/core/src/mindustry/entities/type/base/CraterUnit.java
@@ -2,9 +2,7 @@ package mindustry.entities.type.base;
 
 import arc.*;
 import arc.math.*;
-import arc.math.geom.*;
 import arc.util.*;
-import mindustry.entities.type.*;
 import mindustry.ui.*;
 import mindustry.type.*;
 import mindustry.world.*;
@@ -34,39 +32,10 @@ public class CraterUnit extends GroundUnit{
     },
     move = new UnitState(){
         public void update(){
-//            float radScl = 1.5f;
-//            float fsize = getSize() / radScl / 100;
-//            float cx = x - fsize/2f, cy = y - fsize/2f;
+            // move in the direction/rotation of the block its currently on
+            velocity.add(vec.trnsExact(angleTo(on().front()), type.speed * Time.delta()));
+            rotation = Mathf.slerpDelta(rotation, baseRotation, type.rotatespeed);
 
-//            Log.info(unitGroup.intersect(x, y, 3, 3).size);
-
-//            int size = unitGroup.intersect(cx, cy, fsize, fsize).select(unit -> {
-//                Log.info(lastPosition());
-//                Log.info(lastPosition().trns(45, tilesize));
-
-//                Vec2 front = lastPosition().cpy().add(lastPosition().trns(rotation, 6));
-
-//                return front.dst(unit) < 2;
-
-//                velocity.scl()
-
-//            }).size;
-//            Log.info(player.lastPosition());
-//            Log.info(lastPosition());
-//            Log.info(size);
-//
-//            if(size < 1){
-
-//            if(moveVector.isZero()){
-                // move in the direction/rotation of the block its currently on
-                velocity.add(vec.trnsExact(angleTo(on().front()), type.speed * Time.delta()));
-                rotation = Mathf.slerpDelta(rotation, baseRotation, type.rotatespeed);
-//            }
-//            }
-
-//            velocity.
-
-            Log.info(moveVector);
             // switch to unload when on an end tile
             if(dst(on()) < 2.5f && on(Track.end)){
                 state.set(unload);