mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Merge unmerged items and don't always merge first item

Browse Source
This commit is contained in:
Daniel Walsh 2019-10-04 12:49:23 +01:00
parent 23c39dc81e
commit 5b188bcfaa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java
View File

@ -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<>();