From 5b188bcfaa198e4ae02f2c40cd0bfc2a4682a016 Mon Sep 17 00:00:00 2001
From: Daniel Walsh <walshydev@gmail.com>
Date: Fri, 4 Oct 2019 12:49:23 +0100
Subject: [PATCH] Merge unmerged items and don't always merge first item

---
 .../Slimefun/api/item_transport/CargoNet.java              | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java b/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java
index 1b12fecb4..15afb70a0 100644
--- a/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java
+++ b/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java
@@ -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<>();