From b1b89290b97160466d5d840f03a23a20b370f6fa Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 7 Aug 2021 12:08:30 -0400
Subject: [PATCH] Implemented Anuken/Mindustry-Suggestions/issues/2809

---
 .../blocks/production/disassembler.png        | Bin 2260 -> 2264 bytes
 core/src/mindustry/input/Placement.java       |   9 ++++++++-
 gradle.properties                             |   2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/production/disassembler.png b/core/assets-raw/sprites/blocks/production/disassembler.png
index 7dbfcb14742caad5cde944dc723cfc0c919f96e7..4e4a4d3433803439bff11a56c0b27d58b65d9bca 100644
GIT binary patch
delta 1796
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

delta 1791
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

diff --git a/core/src/mindustry/input/Placement.java b/core/src/mindustry/input/Placement.java
index f4afb96683..55044dc8e0 100644
--- a/core/src/mindustry/input/Placement.java
+++ b/core/src/mindustry/input/Placement.java
@@ -108,7 +108,13 @@ public class Placement{
         points.addAll(result);
     }
 
+    public static boolean isSidePlace(Seq<BuildPlan> plans){
+        return plans.size > 1 && Mathf.mod(Tile.relativeTo(plans.first().x, plans.first().y, plans.get(1).x, plans.get(1).y) - plans.first().rotation, 2) == 1;
+    }
+
     public static void calculateBridges(Seq<BuildPlan> plans, ItemBridge bridge){
+        if(isSidePlace(plans)) return;
+
         //check for orthogonal placement + unlocked state
         if(!(plans.first().x == plans.peek().x || plans.first().y == plans.peek().y) || !bridge.unlockedNow()){
             return;
@@ -170,6 +176,8 @@ public class Placement{
     }
 
     public static void calculateDuctBridges(Seq<BuildPlan> plans, DuctBridge bridge){
+        if(isSidePlace(plans)) return;
+
         //check for orthogonal placement + unlocked state
         if(!(plans.first().x == plans.peek().x || plans.first().y == plans.peek().y) || !bridge.unlockedNow()){
             return;
@@ -180,7 +188,6 @@ public class Placement{
 
         var result = plans1.clear();
         var team = player.team();
-        var rot = plans.first().rotation;
 
         outer:
         for(int i = 0; i < plans.size;){
diff --git a/gradle.properties b/gradle.properties
index fb533c1a2f..dc2ce3354d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,4 +8,4 @@ kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
 #needed for android compilation
 android.useAndroidX=true
-archash=e226c78ba913d348c97430e453f038e824c06bcb
+archash=28f7dea17ba559a28e79111adc93cf0496ced031