From f0305d702743ebcf798393ac7ebc336a60fb1a6f Mon Sep 17 00:00:00 2001
From: lcy0x1 <arthurlcy0x1@gmail.com>
Date: Sun, 9 Jan 2022 18:02:21 -0800
Subject: [PATCH] check funnel first to fix bug

---
 .../relays/belt/transport/BeltInventory.java  | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java
index f431cdeab..6ba231609 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java
@@ -58,10 +58,10 @@ public class BeltInventory {
 			belt.setChanged();
 			belt.sendData();
 		}
-		
+
 		if (belt.getSpeed() == 0)
 			return;
-		
+
 		// Reverse item collection if belt just reversed
 		if (beltMovementPositive != belt.getDirectionAwareBeltMovementSpeed() > 0) {
 			beltMovementPositive = !beltMovementPositive;
@@ -107,7 +107,7 @@ public class BeltInventory {
 			// Don't move if held by processing (client)
 			if (world.isClientSide && currentItem.locked)
 				continue;
-			
+
 			// Don't move if held by external components
 			if (currentItem.lockedExternally) {
 				currentItem.lockedExternally = false;
@@ -149,7 +149,12 @@ public class BeltInventory {
 				if (currentItem.locked)
 					continue;
 			}
-			
+
+
+			// Belt Funnels
+			if (BeltFunnelInteractionHandler.checkForFunnels(this, currentItem, nextOffset))
+				continue;
+
 			if (noMovement)
 				continue;
 
@@ -157,10 +162,6 @@ public class BeltInventory {
 			if (BeltTunnelInteractionHandler.flapTunnelsAndCheckIfStuck(this, currentItem, nextOffset))
 				continue;
 
-			// Belt Funnels
-			if (BeltFunnelInteractionHandler.checkForFunnels(this, currentItem, nextOffset))
-				continue;
-
 			// Horizontal Crushing Wheels
 			if (BeltCrusherInteractionHandler.checkForCrushers(this, currentItem, nextOffset))
 				continue;
@@ -243,7 +244,7 @@ public class BeltInventory {
 			belt.sendData();
 			return false;
 		}
-		
+
 		if (noMovement)
 			return false;
 
@@ -449,5 +450,5 @@ public class BeltInventory {
 	public List<TransportedItemStack> getTransportedItems() {
 		return items;
 	}
-	
+
 }