Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

 Conflicts:

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

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

@@ -118,36 +118,7 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
         type.update(self());
 
         if(type.collidesTiles && type.collides && type.collidesGround){
-            world.raycastEach(World.toTile(lastX()), World.toTile(lastY()), tileX(), tileY(), (x, y) -> {
-
-                Building build = world.build(x, y);
-                if(build == null || !isAdded()) return false;
-
-                if(build.collide(self()) && type.testCollision(self(), build) && !build.dead() && (type.collidesTeam || build.team != team) && !(type.pierceBuilding && hasCollided(build.id))){
-                    boolean remove = false;
-
-                    float health = build.health;
-
-                    if(build.team != team){
-                        remove = build.collision(self());
-                    }
-
-                    if(remove || type.collidesTeam){
-                        if(!type.pierceBuilding){
-                            hit = true;
-                            remove();
-                        }else{
-                            collided.add(build.id);
-                        }
-                    }
-
-                    type.hitTile(self(), build, health, true);
-
-                    return !type.pierceBuilding;
-                }
-
-                return false;
-            });
+            tileRaycast(World.toTile(lastX()), World.toTile(lastY()), tileX(), tileY());
         }
 
         if(type.pierceCap != -1 && collided.size >= type.pierceCap){
@@ -156,6 +127,55 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
         }
     }
 
+    //copy-paste of World#raycastEach, inlined for lambda capture performance.
+    @Override
+    public void tileRaycast(int x0f, int y0f, int x1, int y1){
+        int x = x0f, dx = Math.abs(x1 - x), sx = x < x1 ? 1 : -1;
+        int y = y0f, dy = Math.abs(y1 - y), sy = y < y1 ? 1 : -1;
+        int e2, err = dx - dy;
+
+        while(true){
+            Building build = world.build(x, y);
+            if(build != null && isAdded() && build.collide(self()) && type.testCollision(self(), build)
+                && !build.dead() && (type.collidesTeam || build.team != team) && !(type.pierceBuilding && hasCollided(build.id))){
+
+                boolean remove = false;
+                float health = build.health;
+
+                if(build.team != team){
+                    remove = build.collision(self());
+                }
+
+                if(remove || type.collidesTeam){
+                    if(!type.pierceBuilding){
+                        hit = true;
+                        remove();
+                    }else{
+                        collided.add(build.id);
+                    }
+                }
+
+                type.hitTile(self(), build, health, true);
+
+                //stop raycasting when building is hit
+                if(type.pierceBuilding) return;
+            }
+
+            if(x == x1 && y == y1) break;
+
+            e2 = 2 * err;
+            if(e2 > -dy){
+                err -= dy;
+                x += sx;
+            }
+
+            if(e2 < dx){
+                err += dx;
+                y += sy;
+            }
+        }
+    }
+
     @Override
     public void draw(){
         Draw.z(type.layer);

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

@@ -45,6 +45,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
     transient String lastText = "";
     transient float textFadeTime;
     transient private Unit lastReadUnit = Nulls.unit;
+    transient private int wrongReadUnits;
     transient @Nullable Unit justSwitchFrom, justSwitchTo;
 
     public boolean isBuilder(){
@@ -104,9 +105,15 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         //reason: we know the server is lying here, essentially skip the unit snapshot because we know the client's information is more recent
         if(isLocal() && unit == justSwitchFrom && justSwitchFrom != null && justSwitchTo != null){
             unit = justSwitchTo;
+            //if several snapshots have passed and this unit is still incorrect, something's wrong
+            if(++wrongReadUnits >= 2){
+                justSwitchFrom = null;
+                wrongReadUnits = 0;
+            }
         }else{
             justSwitchFrom = null;
             justSwitchTo = null;
+            wrongReadUnits = 0;
         }
 
         //simulate a unit change after sync

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

@@ -40,8 +40,8 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
 
     @Import int id;
     @Import float x, y;
+    @Import boolean added;
 
-    transient private boolean mismatch = false;
     transient float accepting, updateTime, lastRipple = Time.time + Mathf.random(40f);
     float amount;
     Tile tile;
@@ -79,9 +79,12 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
             return;
         }
 
-        if(Puddles.get(tile) != self()){
-            mismatch = true;
-            remove();
+        if(Puddles.get(tile) != self() && added){
+            //force removal without pool free
+            Groups.all.remove(self());
+            Groups.draw.remove(self());
+            Groups.puddle.remove(self());
+            added = false;
             return;
         }
 
@@ -134,9 +137,7 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
 
     @Override
     public void remove(){
-        if(!mismatch){
-            Puddles.remove(tile);
-        }
+        Puddles.remove(tile);
     }
 
     @Override