From 24d3afca1806b5a141de56a8e19e93f3631b3539 Mon Sep 17 00:00:00 2001
From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sat, 14 Aug 2021 15:48:52 -0700
Subject: [PATCH 1/2] If a block doesn't rotate, then don't check if the
 payload conveyor is trying to input into the output side (#5766)

* If a block doesn't rotate, then don't check if the payload conveyor is trying to input into the output side

* b l o c k

* h

* Revert "h"

This reverts commit 2860818e3f1d01a13ae35704897ac4b50e71b40f.
---
 .../mindustry/world/blocks/distribution/PayloadConveyor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
index 38f1558233..f9c42a4cfc 100644
--- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
@@ -113,7 +113,7 @@ public class PayloadConveyor extends Block{
 
             int ntrns = 1 + size/2;
             Tile next = tile.nearby(Geometry.d4(rotation).x * ntrns, Geometry.d4(rotation).y * ntrns);
-            blocked = (next != null && next.solid() && !next.block().outputsPayload) || (this.next != null && (this.next.rotation + 2)%4 == rotation);
+            blocked = (next != null && next.solid() && !next.block().outputsPayload) || (this.next != null && this.next.block.rotate && (this.next.rotation + 2) % 4 == rotation);
         }
 
         @Override

From 79939db1702a179c40f6700cf6d25c55ff7506ae Mon Sep 17 00:00:00 2001
From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sat, 14 Aug 2021 17:35:29 -0700
Subject: [PATCH 2/2] If it accepts payloads, then it shouldn't be blocked.
 (#5767)

---
 .../mindustry/world/blocks/distribution/PayloadConveyor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
index f9c42a4cfc..1579589898 100644
--- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
@@ -113,7 +113,7 @@ public class PayloadConveyor extends Block{
 
             int ntrns = 1 + size/2;
             Tile next = tile.nearby(Geometry.d4(rotation).x * ntrns, Geometry.d4(rotation).y * ntrns);
-            blocked = (next != null && next.solid() && !next.block().outputsPayload) || (this.next != null && this.next.block.rotate && (this.next.rotation + 2) % 4 == rotation);
+            blocked = (next != null && next.solid() && !(next.block().outputsPayload || next.block().acceptsPayload)) || (this.next != null && this.next.block.rotate && (this.next.rotation + 2) % 4 == rotation);
         }
 
         @Override