From 9c75133fc8266c595b079dd2674732adb8ac6bcd Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <patrick@queztech.net>
Date: Thu, 5 Mar 2020 14:21:41 +0100
Subject: [PATCH] Blend tripod dumper with conveyors

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

diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java
index 6aa1c8bce0..e76fa3fb51 100644
--- a/core/src/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java
@@ -17,6 +17,7 @@ import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
+import mindustry.world.blocks.distribution.CraterConveyor.*;
 import mindustry.world.meta.*;
 
 import java.io.*;
@@ -115,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) || (otherblock instanceof CraterConveyor && world.tile(otherx, othery).<CraterConveyorEntity>ent().blendbit2 == 6));
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java
index c188f9681c..292f939cde 100644
--- a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java
@@ -138,6 +138,8 @@ 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