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

Comparator cleanup

Browse Source
This commit is contained in:
Anuken
2021-10-24 15:18:21 -04:00
parent 16f4e300a8
commit b6acf1af0a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/world/blocks/storage/Unloader.java
View File

@@ -138,10 +138,10 @@ public class Unloader extends Block{
} }
//sort so it gives full priority to blocks that can give but not receive (stackConveyors and Storage), and then by load //sort so it gives full priority to blocks that can give but not receive (stackConveyors and Storage), and then by load
possibleBlocks.sort((e1, e2) -> { possibleBlocks.sort(Structs.comps(
int getsPriority = Boolean.compare((e1.building.block instanceof StorageBlock || e1.building.block instanceof StackConveyor), (e2.building.block instanceof StorageBlock || e2.building.block instanceof StackConveyor)); Structs.comparingBool(e -> e.building.block instanceof StorageBlock || e.building.block instanceof StackConveyor),
return (getsPriority != 0) ? getsPriority : Float.compare(e1.loadFactor, e2.loadFactor); Structs.comparingFloat(e -> e.loadFactor)
}); ));
ContainerStat dumpingFrom = null; ContainerStat dumpingFrom = null;
ContainerStat dumpingTo = null; ContainerStat dumpingTo = null;