Fixed #2591 / Fixed #2591 / Fixed #2589 / Fixed #2587

core/assets/icons/icons.properties

@@ -312,3 +312,4 @@
 63432=dacite-boulder|block-dacite-boulder-medium
 63431=large-logic-display|block-large-logic-display-medium
 63430=omura|unit-omura-medium
+63429=mud|block-mud-medium

core/src/mindustry/ai/types/FormationAI.java

@@ -58,6 +58,7 @@ public class FormationAI extends AIController implements FormationMember{
     public void removed(Unit unit){
         if(formation != null){
             formation.removeMember(this);
+            unit.resetController();
         }
     }
 

core/src/mindustry/async/PhysicsProcess.java

@@ -35,6 +35,7 @@ public class PhysicsProcess implements AsyncProcess{
         refs.removeAll(ref -> {
             if(!ref.entity.isAdded()){
                 physics.destroyBody(ref.body);
+                ref.entity.physref(null);
                 return true;
             }
             return false;

core/src/mindustry/editor/MapEditor.java

@@ -231,8 +231,14 @@ public class MapEditor{
                 int px = offsetX + x, py = offsetY + y;
                 if(previous.in(px, py)){
                     tiles.set(x, y, previous.getn(px, py));
-                    tiles.getn(x, y).x = (short)x;
+                    Tile tile = tiles.getn(x, y);
-                    tiles.getn(x, y).y = (short)y;
+                    tile.x = (short)x;
+                    tile.y = (short)y;
+
+                    if(tile.build != null && tile.isCenter()){
+                        tile.build.x = x * tilesize + tile.block().offset;
+                        tile.build.y = y * tilesize + tile.block().offset;
+                    }
                 }else{
                     tiles.set(x, y, new EditorTile(x, y, Blocks.stone.id, (short)0, (short)0));
                 }

core/src/mindustry/entities/comp/PayloadComp.java

@@ -48,6 +48,9 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
         unit.remove();
         payloads.add(new UnitPayload(unit));
         Fx.unitPickup.at(unit);
+        if(Vars.net.client()){
+            Vars.netClient.clearRemovedEntity(unit.id);
+        }
     }
 
     void pickup(Building tile){

core/src/mindustry/input/DesktopInput.java

@@ -225,7 +225,7 @@ public class DesktopInput extends InputHandler{
         if(!player.dead() && !state.isPaused() && !(Core.scene.getKeyboardFocus() instanceof TextField)){
             updateMovement(player.unit());
 
-            if(Core.input.keyDown(Binding.respawn) && !player.unit().spawnedByCore()){
+            if(Core.input.keyDown(Binding.respawn) && !player.unit().spawnedByCore() && !scene.hasField()){
                 Call.unitClear(player);
                 controlledType = null;
             }

core/src/mindustry/io/SaveIO.java

@@ -3,6 +3,7 @@ package mindustry.io;
 import arc.*;
 import arc.files.*;
 import arc.struct.*;
+import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
 import mindustry.game.EventType.*;
@@ -41,7 +42,7 @@ public class SaveIO{
         if(exists) file.moveTo(backupFileFor(file));
         try{
             write(file);
-        }catch(Exception e){
+        }catch(Throwable e){
             if(exists) backupFileFor(file).moveTo(file);
             throw new RuntimeException(e);
         }
@@ -56,9 +57,9 @@ public class SaveIO{
     }
 
     public static boolean isSaveValid(Fi file){
-        try{
+        try(DataInputStream stream = new DataInputStream(new InflaterInputStream(file.read(bufferSize)))){
-            return isSaveValid(new DataInputStream(new InflaterInputStream(file.read(bufferSize))));
+            return isSaveValid(stream);
-        }catch(Exception e){
+        }catch(Throwable e){
             return false;
         }
     }
@@ -67,8 +68,8 @@ public class SaveIO{
         try{
             getMeta(stream);
             return true;
-        }catch(Exception e){
+        }catch(Throwable e){
-            e.printStackTrace();
+            Log.err(e);
             return false;
         }
     }
@@ -76,8 +77,8 @@ public class SaveIO{
     public static SaveMeta getMeta(Fi file){
         try{
             return getMeta(getStream(file));
-        }catch(Exception e){
+        }catch(Throwable e){
-            e.printStackTrace();
+            Log.err(e);
             return getMeta(getBackupStream(file));
         }
     }
@@ -120,7 +121,7 @@ public class SaveIO{
             }else{
                 getVersion().write(stream, tags);
             }
-        }catch(Exception e){
+        }catch(Throwable e){
             throw new RuntimeException(e);
         }
     }
@@ -134,7 +135,7 @@ public class SaveIO{
             //try and load; if any exception at all occurs
             load(new InflaterInputStream(file.read(bufferSize)), context);
         }catch(SaveException e){
-            e.printStackTrace();
+            Log.err(e);
             Fi backup = file.sibling(file.name() + "-backup." + file.extension());
             if(backup.exists()){
                 load(new InflaterInputStream(backup.read(bufferSize)), context);
@@ -154,7 +155,7 @@ public class SaveIO{
 
             ver.read(stream, counter, context);
             Events.fire(new SaveLoadEvent());
-        }catch(Exception e){
+        }catch(Throwable e){
             throw new SaveException(e);
         }finally{
             world.setGenerating(false);

core/src/mindustry/ui/dialogs/ResearchDialog.java

@@ -377,8 +377,18 @@ public class ResearchDialog extends BaseDialog{
         }
 
         boolean canSpend(TechNode node){
-            //can spend when there's at least 1 item that can be spent
+            if(!selectable(node)) return false;
-            return selectable(node) && (node.requirements.length == 0 || Structs.contains(node.requirements, i -> items.has(i.item)));
+
+            if(node.requirements.length == 0) return true;
+
+            //can spend when there's at least 1 item that can be spent (non complete)
+            for(int i = 0; i < node.requirements.length; i++){
+                if(node.finishedRequirements[i].amount < node.requirements[i].amount && items.has(node.requirements[i].item)){
+                    return true;
+                }
+            }
+
+            return false;
         }
 
         void spend(TechNode node){