Double Trouble

- Fixed an item duplication issue with belts
- Spectators can no longer interact with contraptions

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandlerClient.java

@@ -75,6 +75,8 @@ public class ContraptionHandlerClient {
 
 		if (player == null)
 			return;
+		if (player.isSpectator())
+			return;
 		if (mc.level == null)
 			return;
 		if (!event.isUseItem())

src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java

@@ -428,6 +428,8 @@ public class BeltInventory {
 		Function<TransportedItemStack, TransportedResult> processFunction) {
 		boolean dirty = false;
 		for (TransportedItemStack transported : items) {
+			if (toRemove.contains(transported))
+				continue;
 			ItemStack stackBefore = transported.stack.copy();
 			if (Math.abs(position - transported.beltPosition) >= maxDistanceToPosition)
 				continue;

src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntity.java

@@ -511,6 +511,8 @@ public class CarriageContraptionEntity extends OrientedContraptionEntity {
 
 	@Override
 	public boolean startControlling(BlockPos controlsLocalPos, Player player) {
+		if (player == null || player.isSpectator())
+			return false;
 		if (carriage == null)
 			return false;
 		if (carriage.train.derailed)

src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainRelocator.java

@@ -79,6 +79,8 @@ public class TrainRelocator {
 		LocalPlayer player = mc.player;
 		if (player == null)
 			return;
+		if (player.isSpectator())
+			return;
 
 		if (!player.position()
 			.closerThan(relocatingOrigin, 24) || player.isSteppingCarefully()) {

src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItemRetrieval.java

@@ -28,6 +28,8 @@ public class ScheduleItemRetrieval {
 		Player player = event.getPlayer();
 		if (player == null || entity == null)
 			return;
+		if (player.isSpectator())
+			return;
 
 		Entity rootVehicle = entity.getRootVehicle();
 		if (!(rootVehicle instanceof CarriageContraptionEntity))