Additional crashes/synchronizations fixed

core/src/io/anuke/mindustry/entities/StatusController.java

@@ -6,6 +6,7 @@ import io.anuke.mindustry.entities.traits.Saveable;
 import io.anuke.mindustry.type.StatusEffect;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.util.Pooling;
+import io.anuke.ucore.util.ThreadArray;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -14,9 +15,9 @@ import java.io.IOException;
 /**Class for controlling status effects on an entity.*/
 public class StatusController implements Saveable{
     private static final StatusEntry globalResult = new StatusEntry();
-    private static final Array<StatusEntry> removals = new Array<>();
+    private static final Array<StatusEntry> removals = new ThreadArray<>();
 
-    private Array<StatusEntry> statuses = new Array<>();
+    private Array<StatusEntry> statuses = new ThreadArray<>();
 
     private float speedMultiplier;
     private float damageMultiplier;

core/src/io/anuke/mindustry/graphics/OverlayRenderer.java

@@ -6,9 +6,11 @@ import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Array;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.Player;
+import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.game.TeamInfo.TeamData;
 import io.anuke.mindustry.input.InputHandler;
+import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockBar;
 import io.anuke.ucore.core.Graphics;
@@ -66,9 +68,7 @@ public class OverlayRenderer {
                 Tile tile = world.tileWorld(vec.x, vec.y);
 
                 if (tile != null && tile.block() != Blocks.air) {
-                    Tile target = tile;
+                    Tile target = tile.target();
-                    if (tile.isLinked())
-                        target = tile.getLinked();
 
                     if (showBlockDebug && target.entity != null) {
                         Draw.color(Color.RED);
@@ -93,49 +93,51 @@ public class OverlayRenderer {
                         Draw.reset();
                     }
 
-                    if (target.entity != null) {
-                        int[] values = {0, 0};
-                        Tile t = target;
-                        boolean[] doDraw = {false};
-
-                        Callable drawbars = () -> {
-                            for (BlockBar bar : t.block().bars.list()) {
-                                //TODO fix.
-                                float offset = Mathf.sign(bar.top) * (t.block().size / 2f * tilesize + 2f + (bar.top ? values[0] : values[1]));
-
-                                float value = bar.value.get(t);
-
-                                if (MathUtils.isEqual(value, -1f)) continue;
-
-                                if(doDraw[0]){
-                                    drawBar(bar.type.color, t.drawx(), t.drawy() + offset, value);
-                                }
-
-                                if (bar.top)
-                                    values[0]++;
-                                else
-                                    values[1]++;
-                            }
-                        };
-
-                        drawbars.run();
-
-                        if(values[0] > 0){
-                            drawEncloser(target.drawx(), target.drawy() + target.block().size * tilesize/2f + 2f + values[0]/2f - 0.5f + (values[0] > 2 ? 0.5f : 0), values[0]);
-                        }
-
-                        if(values[1] > 0){
-                            drawEncloser(target.drawx(), target.drawy() - target.block().size * tilesize/2f - 2f - values[1]/2f - 0.5f, values[1]);
-                        }
-
-                        doDraw[0] = true;
-                        values[0] = 0;
-                        values[1] = 1;
-
-                        drawbars.run();
-                    }
-
                     synchronized (Tile.tileSetLock) {
+                        Block block = target.block();
+                        TileEntity entity = target.entity;
+
+                        if (entity != null) {
+                            int[] values = {0, 0};
+                            boolean[] doDraw = {false};
+
+                            Callable drawbars = () -> {
+                                for (BlockBar bar : block.bars.list()) {
+                                    float offset = Mathf.sign(bar.top) * (block.size / 2f * tilesize + 2f + (bar.top ? values[0] : values[1]));
+
+                                    float value = bar.value.get(target);
+
+                                    if (MathUtils.isEqual(value, -1f)) continue;
+
+                                    if(doDraw[0]){
+                                        drawBar(bar.type.color, target.drawx(), target.drawy() + offset, value);
+                                    }
+
+                                    if (bar.top)
+                                        values[0]++;
+                                    else
+                                        values[1]++;
+                                }
+                            };
+
+                            drawbars.run();
+
+                            if(values[0] > 0){
+                                drawEncloser(target.drawx(), target.drawy() + block.size * tilesize/2f + 2f + values[0]/2f - 0.5f + (values[0] > 2 ? 0.5f : 0), values[0]);
+                            }
+
+                            if(values[1] > 0){
+                                drawEncloser(target.drawx(), target.drawy() - block.size * tilesize/2f - 2f - values[1]/2f - 0.5f, values[1]);
+                            }
+
+                            doDraw[0] = true;
+                            values[0] = 0;
+                            values[1] = 1;
+
+                            drawbars.run();
+                        }
+
+
                         target.block().drawSelect(target);
                     }
                 }

core/src/io/anuke/mindustry/world/Block.java

@@ -235,8 +235,8 @@ public class Block extends BaseBlock implements Content{
 
 	//TODO make this easier to config.
 	public void setBars(){
-		if(hasPower) bars.add(new io.anuke.mindustry.world.meta.BlockBar(BarType.power, true, tile -> tile.entity.power.amount / powerCapacity));
+		if(hasPower) bars.add(new BlockBar(BarType.power, true, tile -> tile.entity.power.amount / powerCapacity));
-		if(hasLiquids) bars.add(new io.anuke.mindustry.world.meta.BlockBar(BarType.liquid, true, tile -> tile.entity.liquids.amount / liquidCapacity));
+		if(hasLiquids) bars.add(new BlockBar(BarType.liquid, true, tile -> tile.entity.liquids.amount / liquidCapacity));
 		if(hasItems) bars.add(new BlockBar(BarType.inventory, true, tile -> (float)tile.entity.items.totalItems() / itemCapacity));
 	}