From b2b0082c7d246c8281fc50670f870e25a82b16d8 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 25 Oct 2020 09:23:13 -0400
Subject: [PATCH] Fixed #3108 / Fixed #3112

---
 core/src/mindustry/logic/LExecutor.java   | 5 +++--
 core/src/mindustry/logic/LStatements.java | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index d287e9e482..88725da53b 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -273,9 +273,9 @@ public class LExecutor{
                         cache.found = false;
                         exec.setnum(outFound, 0);
                     }
-                    exec.setobj(outBuild, res != null && res.build != null && res.build.team == exec.team ? res.build : null);
+                    exec.setobj(outBuild, res != null && res.build != null && res.build.team == exec.team ? cache.build = res.build : null);
                 }else{
-                    exec.setobj(outBuild, null);
+                    exec.setobj(outBuild, cache.build);
                     exec.setbool(outFound, cache.found);
                     exec.setnum(outX, cache.x);
                     exec.setnum(outY, cache.y);
@@ -286,6 +286,7 @@ public class LExecutor{
         static class Cache{
             float x, y;
             boolean found;
+            Building build;
         }
     }
 
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index ae1c346373..f804ad5a20 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -748,7 +748,7 @@ public class LStatements{
     @RegisterStatement("ucontrol")
     public static class UnitControlStatement extends LStatement{
         public LUnitControl type = LUnitControl.move;
-        public String p1 = "0", p2 = "0", p3 = "0", p4 = "0", p5 = "";
+        public String p1 = "0", p2 = "0", p3 = "0", p4 = "0", p5 = "0";
 
         @Override
         public void build(Table table){
@@ -777,9 +777,13 @@ public class LStatements{
             int c = 0;
             for(int i = 0; i < type.params.length; i++){
 
-                fields(table, type.params[i], i == 0 ? p1 : i == 1 ? p2 : i == 2 ? p3 : p4, i == 0 ? v -> p1 = v : i == 1 ? v -> p2 = v : i == 2 ? v -> p3 = v : i == 3 ? v -> p4 = v : v -> p5 = v).width(110f);
+                fields(table, type.params[i], i == 0 ? p1 : i == 1 ? p2 : i == 2 ? p3 : i == 3 ? p4 : p5, i == 0 ? v -> p1 = v : i == 1 ? v -> p2 = v : i == 2 ? v -> p3 = v : i == 3 ? v -> p4 = v : v -> p5 = v).width(100f);
 
                 if(++c % 2 == 0) row(table);
+
+                if(i == 3){
+                    table.row();
+                }
             }
         }