From f8b360bca61b2a56425f3d203f5902f25ded0727 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 20 Dec 2021 15:31:50 -0500 Subject: [PATCH] Fixed assembly modules yeeting into obstruction --- core/src/mindustry/content/Blocks.java | 3 ++- core/src/mindustry/world/blocks/units/UnitAssemblerModule.java | 2 +- gradle.properties | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index cf3c02c6a1..68ce9e9eb5 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1530,12 +1530,13 @@ public class Blocks{ requirements(Category.effect, with(Items.silicon, 60, Items.tungsten, 60, Items.oxide, 40)); outlineColor = Pal.darkOutline; consumes.power(3f); - range = 120f; + range = 150f; size = 3; buildSpeed = 1.5f; }}; //TODO green looks bad switch to orange + //TODO orange also looks bad hhhh regenProjector = new RegenProjector("regen-projector"){{ requirements(Category.effect, with(Items.silicon, 60, Items.tungsten, 60, Items.oxide, 40)); size = 3; diff --git a/core/src/mindustry/world/blocks/units/UnitAssemblerModule.java b/core/src/mindustry/world/blocks/units/UnitAssemblerModule.java index e379d50d6a..228df155dd 100644 --- a/core/src/mindustry/world/blocks/units/UnitAssemblerModule.java +++ b/core/src/mindustry/world/blocks/units/UnitAssemblerModule.java @@ -128,7 +128,7 @@ public class UnitAssemblerModule extends PayloadBlock{ findLink(); } - if(moveInPayload() && link != null && link.moduleFits(block, x, y, rotation) && link.acceptPayload(this, payload) && consValid()){ + if(moveInPayload() && link != null && link.moduleFits(block, x, y, rotation) && !link.wasOccupied && link.acceptPayload(this, payload) && consValid()){ link.yeetPayload(payload); payload = null; } diff --git a/gradle.properties b/gradle.properties index bbc53a83d8..c72da51d2f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=82157de87b +archash=0370ef92e5