From 1cefaf28dbee1f387b7404821d0d4956a2b7a766 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 15 May 2020 19:59:42 -0400
Subject: [PATCH] Edge tweaks

---
 core/src/mindustry/world/Edges.java                      | 9 +++++++--
 .../mindustry/world/blocks/distribution/ItemBridge.java  | 4 ++--
 gradle.properties                                        | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/world/Edges.java b/core/src/mindustry/world/Edges.java
index 4d9d4a76a7..5ed7dc3318 100644
--- a/core/src/mindustry/world/Edges.java
+++ b/core/src/mindustry/world/Edges.java
@@ -1,9 +1,10 @@
 package mindustry.world;
 
-import arc.math.Mathf;
+import arc.math.*;
 import arc.math.geom.*;
+import mindustry.gen.*;
 
-import java.util.Arrays;
+import java.util.*;
 
 import static mindustry.Vars.world;
 
@@ -49,6 +50,10 @@ public class Edges{
         }
     }
 
+    public static Tile getFacingEdge(Tilec tile, Tilec other){
+        return getFacingEdge(tile.block(), tile.tileX(), tile.tileY(), other.tile());
+    }
+
     public static Tile getFacingEdge(Tile tile, Tile other){
         return getFacingEdge(tile.block, tile.x, tile.y, other);
     }
diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
index 43b8a630df..eab96ee848 100644
--- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java
+++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
@@ -276,7 +276,7 @@ public class ItemBridge extends Block{
 
             if(linkValid(tile, other)){
                 int rel = relativeTo(other);
-                int rel2 = relativeTo(Edges.getFacingEdge(source.tile(), tile));
+                int rel2 = relativeTo(Edges.getFacingEdge(source, this));
 
                 if(rel == rel2) return false;
             }else{
@@ -319,7 +319,7 @@ public class ItemBridge extends Block{
 
             if(linkValid(tile, other)){
                 int rel = relativeTo(other.x, other.y);
-                int rel2 = relativeTo(source.tileX(), source.tileY());
+                int rel2 = relativeTo(Edges.getFacingEdge(source, this));
 
                 if(rel == rel2) return false;
             }else if(!(source.block() instanceof ItemBridge && ((ItemBridgeEntity)source).link == tile.pos())){
diff --git a/gradle.properties b/gradle.properties
index 8024c2b418..fe545b57db 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=45377e8f7daca3299262a92d387a0d12fc612e12
+archash=811e22ca49b8e5ad1cffb36a74199c1bec73ee87