From 44bff5b7cfc96a7b0779777f7d29dfad9914407e Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <patrick@queztech.net>
Date: Thu, 5 Mar 2020 21:29:19 +0100
Subject: [PATCH] Remove conveyor integration remnants

---
 core/src/mindustry/world/blocks/distribution/Conveyor.java      | 2 +-
 .../src/mindustry/world/blocks/distribution/CraterConveyor.java | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java
index 9d7c8cebd6..4f757c8f33 100644
--- a/core/src/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java
@@ -116,7 +116,7 @@ public class Conveyor extends Block implements Autotiler{
 
     @Override
     public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
-        return otherblock.outputsItems() && (lookingAt(tile, rotation, otherx, othery, otherrot, otherblock));
+        return otherblock.outputsItems() && lookingAt(tile, rotation, otherx, othery, otherrot, otherblock);
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java
index 5fceab89e9..92f4235ddf 100644
--- a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java
@@ -138,8 +138,6 @@ public class CraterConveyor extends Block implements Autotiler{
         entity.blendbit1 = bits[0];
         entity.blendsclx = bits[1];
         entity.blendscly = bits[2];
-
-        entity.proximity().each(t -> t.block() instanceof Conveyor, t -> t.block().onProximityUpdate(t));
     }
 
     @Override