From 77ddbd027a406911dd2431dee144fe6232c6f3a7 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 10 Sep 2022 15:49:58 -0400
Subject: [PATCH] Misc bugfixes and tweaks

---
 core/src/mindustry/content/UnitTypes.java                  | 1 -
 core/src/mindustry/world/blocks/distribution/Junction.java | 1 +
 core/src/mindustry/world/blocks/liquid/LiquidRouter.java   | 1 +
 core/src/mindustry/world/blocks/units/UnitCargoLoader.java | 4 +++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 9063b00de3..7a22a6525b 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -2965,7 +2965,6 @@ public class UnitTypes{
                     }));
 
                     collidesTiles = true;
-                    recoil = 0.5f;
                     backColor = hitColor = Pal.techBlue;
                     frontColor = Color.white;
 
diff --git a/core/src/mindustry/world/blocks/distribution/Junction.java b/core/src/mindustry/world/blocks/distribution/Junction.java
index 804399b715..d02fb84404 100644
--- a/core/src/mindustry/world/blocks/distribution/Junction.java
+++ b/core/src/mindustry/world/blocks/distribution/Junction.java
@@ -20,6 +20,7 @@ public class Junction extends Block{
         underBullets = true;
         group = BlockGroup.transportation;
         unloadable = false;
+        floating = true;
         noUpdateDisabled = true;
     }
 
diff --git a/core/src/mindustry/world/blocks/liquid/LiquidRouter.java b/core/src/mindustry/world/blocks/liquid/LiquidRouter.java
index 32c83b33e3..67b5b289ad 100644
--- a/core/src/mindustry/world/blocks/liquid/LiquidRouter.java
+++ b/core/src/mindustry/world/blocks/liquid/LiquidRouter.java
@@ -14,6 +14,7 @@ public class LiquidRouter extends LiquidBlock{
         solid = false;
         noUpdateDisabled = true;
         canOverdrive = false;
+        floating = true;
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/units/UnitCargoLoader.java b/core/src/mindustry/world/blocks/units/UnitCargoLoader.java
index 28d3cb27b2..389c354e1b 100644
--- a/core/src/mindustry/world/blocks/units/UnitCargoLoader.java
+++ b/core/src/mindustry/world/blocks/units/UnitCargoLoader.java
@@ -91,7 +91,9 @@ public class UnitCargoLoader extends Block{
 
             if(readUnitId != -1){
                 unit = Groups.unit.getByID(readUnitId);
-                readUnitId = -1;
+                if(unit != null || !net.client()){
+                    readUnitId = -1;
+                }
             }
 
             warmup = Mathf.approachDelta(warmup, efficiency, 1f / 60f);