From 6de19200428979abe845eb85e710902098381c56 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 2 Sep 2020 09:35:03 -0400
Subject: [PATCH] Fixed #2476

---
 .../sprites/units/toxopid-joint-base.png      | Bin 0 -> 617 bytes
 core/src/mindustry/content/Blocks.java        |   8 ++++---
 core/src/mindustry/net/BeControl.java         |  20 +++++++++++++++---
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 core/assets-raw/sprites/units/toxopid-joint-base.png

diff --git a/core/assets-raw/sprites/units/toxopid-joint-base.png b/core/assets-raw/sprites/units/toxopid-joint-base.png
new file mode 100644
index 0000000000000000000000000000000000000000..921a27e55c216d1205ca9555c3bc3fb1942555fb
GIT binary patch
literal 617
zcmeAS@N?(olHy`uVBq!ia0y~yU~mIr4mJh`hC;nZEes3{jKx9jP7LeL$-HD>U{dyU
zaSW-L^LDnc-w^{IH||Fon_tb0Q0{AqC|(v>C?4S|6<Ye|`%TRk)wez8KGA$^k+mzg
zMZk$;r-i@l+?txYzY34{?%zADfA=2dEmIt~&bjm;G>C0#(J7{IZ^@98nw+;(Qv(#)
z<u*j0V$fxm%9%QaG3cDJ)`aj=fB*4jPL@2()A6upO6~sE+a3yGepU=gOJ&saG8a#r
zI=M>X=XXir?OQfZnkZbiL1}r!i%G&>`_hBbgxx(mzX<!D$eTS&#CxBE!RzNap_So%
zt2dS|jripH)i~1fS=(mSnX#fTLd{M)hgmLjoAy7m#Auooo8WuFZker(>Xnu1i+!17
z-wXPlD+ym^^E*QA;oVub8O6<Wrz&|0-xb@*>~ti=v(u(|(qyq<UDZ!IPUk{;t~pMh
z;?eWw##K>e))&)+I;TqRe!0GcXN#AYN?OSq{ds)f{;IL9yAx&mcW$r0^l!;^PpU;V
zjRU5ZRE6)FG=(wAX9Lsw{THK-mjuQgmvNlmqV4e1@$)(pChwbjtqtA1*v_9zi84HX
za;?=3*Ce;&>$)Z~t)0}Yp{JWXzw07X$!W*1JGb7iE%kBp`)<e*bUfsAWT9EJXhmpI
zm~6!IB(3*5LSvXeE;!q}-k;^iA>W4e8LU5o;uWUEs9MIhpNX{R(7b)D+gWK(mfC^S
zolJYqX)&zMQ7+QC?hxj2(=2YL_(OLwrawCF4e~{tA1>Q7*6C;+IN!~w*dp*L{3mPP
Y(k;*JH(Rb{U|?YIboFyt=akR{06HTFnE(I)

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 2b4da903c4..8719d6311d 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1504,12 +1504,13 @@ public class Blocks implements ContentList{
 
             hasPower = true;
             size = 2;
-            force = 3f;
+            force = 4f;
             scaledForce = 5.5f;
             range = 170f;
-            damage = 0.08f;
+            damage = 0.1f;
             health = 160 * size * size;
             rotateSpeed = 10;
+            range = 85f;
 
             consumes.powerCond(3f, (TractorBeamEntity e) -> e.target != null);
         }};
@@ -1560,11 +1561,12 @@ public class Blocks implements ContentList{
         segment = new PointDefenseTurret("segment"){{
             requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phasefabric, 25));
 
+            range = 95f;
             hasPower = true;
             consumes.power(3f);
             size = 2;
             shootLength = 5f;
-            bulletDamage = 12f;
+            bulletDamage = 16f;
             reloadTime = 20f;
             health = 190 * size * size;
         }};
diff --git a/core/src/mindustry/net/BeControl.java b/core/src/mindustry/net/BeControl.java
index 8fddbebaa4..a30308ed52 100644
--- a/core/src/mindustry/net/BeControl.java
+++ b/core/src/mindustry/net/BeControl.java
@@ -44,6 +44,17 @@ public class BeControl{
                 }
             }, updateInterval, updateInterval);
         }
+
+        if(System.getProperties().contains("becopy")){
+            try{
+                Fi dest = Fi.get(System.getProperty("becopy"));
+                Fi self = Fi.get(BeControl.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath());
+
+                self.copyTo(dest);
+            }catch(Throwable e){
+                e.printStackTrace();
+            }
+        }
     }
 
     /** asynchronously checks for updates. */
@@ -87,14 +98,17 @@ public class BeControl{
                     boolean[] cancel = {false};
                     float[] progress = {0};
                     int[] length = {0};
-                    Fi file = Fi.get(BeControl.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath());
+                    Fi file = bebuildDirectory.child("client-be-" + updateBuild + ".jar");
+                    Fi fileDest = System.getProperties().contains("becopy") ?
+                        Fi.get(System.getProperty("becopy")) :
+                        Fi.get(BeControl.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath());
 
                     BaseDialog dialog = new BaseDialog("@be.updating");
                     download(updateUrl, file, i -> length[0] = i, v -> progress[0] = v, () -> cancel[0], () -> {
                         try{
                             Runtime.getRuntime().exec(OS.isMac ?
-                                new String[]{"java", "-XstartOnFirstThread", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()} :
-                                new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()}
+                                new String[]{"java", "-XstartOnFirstThread", "-DlastBuild=" + Version.build, "-Dberestart", "-Dbecopy=" + fileDest.absolutePath(), "-jar", file.absolutePath()} :
+                                new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-Dbecopy=" + fileDest.absolutePath(), "-jar", file.absolutePath()}
                             );
                             System.exit(0);
                         }catch(IOException e){