Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed armored duct blending

Browse Source
This commit is contained in:
Anuken
2022-09-02 08:34:53 -04:00
parent b854b0ca22
commit ceb5c832bd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/core/NetClient.java
View File

@@ -32,7 +32,7 @@ import java.util.zip.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class NetClient implements ApplicationListener{ public class NetClient implements ApplicationListener{
private static final float dataTimeout = 60 * 25; private static final float dataTimeout = 60 * 30;
/** ticks between syncs, e.g. 5 means 60/5 = 12 syncs/sec*/ /** ticks between syncs, e.g. 5 means 60/5 = 12 syncs/sec*/
private static final float playerSyncTime = 4; private static final float playerSyncTime = 4;
private static final Reads dataReads = new Reads(null); private static final Reads dataReads = new Reads(null);

2
core/src/mindustry/world/blocks/distribution/Duct.java
View File

@@ -76,7 +76,7 @@ public class Duct extends Block implements Autotiler{
|| ((!otherblock.rotatedOutput(otherx, othery) && Edges.getFacingEdge(otherblock, otherx, othery, tile) != null && || ((!otherblock.rotatedOutput(otherx, othery) && Edges.getFacingEdge(otherblock, otherx, othery, tile) != null &&
Edges.getFacingEdge(otherblock, otherx, othery, tile).relativeTo(tile) == rotation) || Edges.getFacingEdge(otherblock, otherx, othery, tile).relativeTo(tile) == rotation) ||
((otherblock.rotatedOutput(otherx, othery)) && (otherblock instanceof Duct) && Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y))); ((otherblock.rotatedOutput(otherx, othery)) && (otherblock.isDuct) && Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
} }
@Override @Override