mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Merge unmerged items and don't always merge first item
This commit is contained in:
parent
23c39dc81e
commit
5b188bcfaa
@ -164,7 +164,7 @@ public class CargoNet extends Network {
|
||||
Integer frequency = getFrequency(outputNode);
|
||||
list.add(outputNode);
|
||||
|
||||
if (frequency != lastFrequency) {
|
||||
if (frequency != lastFrequency && lastFrequency != -1) {
|
||||
output.merge(frequency, list, (list1, list2) -> {
|
||||
list1.addAll(list2);
|
||||
return list1;
|
||||
@ -174,6 +174,11 @@ public class CargoNet extends Network {
|
||||
|
||||
lastFrequency = frequency;
|
||||
}
|
||||
if (!list.isEmpty())
|
||||
output.merge(lastFrequency, list, (list1, list2) -> {
|
||||
list1.addAll(list2);
|
||||
return list1;
|
||||
});
|
||||
|
||||
//Chest Terminal Stuff
|
||||
final Set<Location> providers = new HashSet<>();
|
||||
|
Loading…
Reference in New Issue
Block a user