From ceb5c832bd0f397c4f4d134715129f846e64a5ec Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 2 Sep 2022 08:34:53 -0400 Subject: [PATCH] Fixed armored duct blending --- core/src/mindustry/core/NetClient.java | 2 +- core/src/mindustry/world/blocks/distribution/Duct.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index e5c3428911..188516e062 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -32,7 +32,7 @@ import java.util.zip.*; import static mindustry.Vars.*; 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*/ private static final float playerSyncTime = 4; private static final Reads dataReads = new Reads(null); diff --git a/core/src/mindustry/world/blocks/distribution/Duct.java b/core/src/mindustry/world/blocks/distribution/Duct.java index 76aacff906..c738270dde 100644 --- a/core/src/mindustry/world/blocks/distribution/Duct.java +++ b/core/src/mindustry/world/blocks/distribution/Duct.java @@ -76,7 +76,7 @@ public class Duct extends Block implements Autotiler{ || ((!otherblock.rotatedOutput(otherx, othery) && Edges.getFacingEdge(otherblock, otherx, othery, tile) != null && 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