From a61234d21e9b1b06e6042da1d6ff13fde293243f Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 26 Jan 2020 21:50:55 -0500 Subject: [PATCH] Minor tweaks --- core/src/mindustry/world/blocks/distribution/Conveyor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index 28cc465743..6a784b0a71 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -180,7 +180,7 @@ public class Conveyor extends Block implements Autotiler{ return; } - float nextMax = e.nextc != null && tile.rotation() == e.nextc.tile.rotation() /** TODO may not accept due to blockage or team */ ? 1f - Math.max(itemSpace - e.nextc.minitem, 0) : 1f; + float nextMax = e.nextc != null && tile.rotation() == e.nextc.tile.rotation() ? 1f - Math.max(itemSpace - e.nextc.minitem, 0) : 1f; for(int i = e.len - 1; i >= 0; i--){ float nextpos = (i == e.len - 1 ? 100f : e.ys[i + 1]) - itemSpace; @@ -194,7 +194,7 @@ public class Conveyor extends Block implements Autotiler{ if(e.ys[i] >= 1f && offloadDir(tile, e.ids[i])){ //align X position if passing forwards - if(e.nextc != null && e.aligned){ + if(e.aligned){ e.nextc.xs[e.nextc.lastInserted] = e.xs[i]; } //remove last item