Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor tweaks

Browse Source
This commit is contained in:
Anuken
2020-01-26 21:50:55 -05:00
parent 9baaacc8ac
commit a61234d21e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -180,7 +180,7 @@ public class Conveyor extends Block implements Autotiler{
return; 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--){ for(int i = e.len - 1; i >= 0; i--){
float nextpos = (i == e.len - 1 ? 100f : e.ys[i + 1]) - itemSpace; 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])){ if(e.ys[i] >= 1f && offloadDir(tile, e.ids[i])){
//align X position if passing forwards //align X position if passing forwards
if(e.nextc != null && e.aligned){ if(e.aligned){
e.nextc.xs[e.nextc.lastInserted] = e.xs[i]; e.nextc.xs[e.nextc.lastInserted] = e.xs[i];
} }
//remove last item //remove last item