From 9cd482d3894328381b9cb024499db1e11e1e182d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 3 Jun 2021 16:01:51 -0400
Subject: [PATCH] Minor bugfix

---
 .../sprites/blocks/environment/dark-panel-5.png | Bin 258 -> 214 bytes
 core/src/mindustry/input/InputHandler.java      |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/environment/dark-panel-5.png b/core/assets-raw/sprites/blocks/environment/dark-panel-5.png
index 3a0ac2b39190ae85b9e6c5ac054fe404904d64d6..2e990695ed11439ede85a0537070720f3496cb3a 100644
GIT binary patch
delta 178
zcmV;j08Rgb0@eYL7#0Wv0000)q>9D>0004VQb$4nuFf3kkv<rIdr3q=R5*>jlSvN1
zAPfWJ{{PWMLLzZiPWWgKRSc;J2}{xmIiVg5!7c${7ZCv2BOoyc+uWfj!g&s$1`svn
zL|FS<@`TSl5%WWA>;XWNlsOS;KHt`S-|b`Fy>_!M&^30|%}Jq!we|&Yevt_15Oz%O
gh9Y^#<hxrx$y@>vQ31#Lf&c&j07*qoM6N<$f)vF^8~^|S

delta 222
zcmV<403rX@0fGXM7$yV*0001iRA<Kk0004VQb$4nuFf3k00004XF*Lt006O%3;baP
zkuDg232;bRa{vGi!vFvd!vV){sAK>D0D?(GK~yNuosq#2z#s?&p#v@*#QuwnfkRRA
z3J-C1Hb6uefUE&nUKIh}<P<!6(x7SdJT(IUT%%AFvDpMmW8DE3fD9JU0jR{iwNyg5
zTDz&F;L6K>fGESFrBM~itmm-bKbOFEFdm03zy;$Yr=YopIU*OO0hH(1q|^nU+xH~$
Y0D~73L-5#GIRF3v07*qoM6N<$f-aC%Hvj+t

diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 991f48124b..f1762ad3fe 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -390,7 +390,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             player.clearUnit();
             //make sure it's AI controlled, so players can't overwrite each other
         }else if(unit.isAI() && unit.team == player.team() && !unit.dead){
-            if(net.client()){
+            if(net.client() && player.isLocal()){
                 player.justSwitchFrom = player.unit();
                 player.justSwitchTo = unit;
             }
@@ -467,7 +467,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
         //only reset the controlled type and control a unit after the timer runs out
         //essentially, this means the client waits for 1 second after controlling something before trying to control something else automatically
-        if(!player.dead() && (recentRespawnTimer -= Time.delta / 60f) <= 0f){
+        if(!player.dead() && (recentRespawnTimer -= Time.delta / 60f) <= 0f && player.justSwitchFrom != player.unit()){
             controlledType = player.unit().type;
         }