Merge remote-tracking branch 'origin/master'

51cds · Aug 15, 2021 · d9ecaa7 · d9ecaa7
2 parents 9355496 + 79939db
commit d9ecaa7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
@@ -113,7 +113,7 @@ public void onProximityUpdate(){
 
             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 || next.block().acceptsPayload)) || (this.next != null && this.next.block.rotate && (this.next.rotation + 2) % 4 == rotation);
         }
 
         @Override