From 283998711db3241636ef35015aea7850c17bf030 Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Wed, 24 Jul 2024 14:24:59 +0200
Subject: [PATCH] Fix CME in minecart capability

---
 .../capability/CapabilityMinecartController.java      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java
index 0bc0538d6..8f3138e81 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java
@@ -1,5 +1,6 @@
 package com.simibubi.create.content.contraptions.minecart.capability;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -128,6 +129,8 @@ public class CapabilityMinecartController implements ICapabilitySerializable<Com
 		queuedRemovals.clear();
 		queued.clear();
 
+		List<UUID> toRemove = new ArrayList<>();
+		
 		for (Entry<UUID, MinecartController> entry : carts.entrySet()) {
 			MinecartController controller = entry.getValue();
 			if (controller != null) {
@@ -136,8 +139,12 @@ public class CapabilityMinecartController implements ICapabilitySerializable<Com
 					continue;
 				}
 			}
-			cartsWithCoupling.remove(entry.getKey());
-			keySet.remove(entry.getKey());
+			toRemove.add(entry.getKey());
+		}
+		
+		for (UUID uuid : toRemove) {
+			keySet.remove(uuid);
+			cartsWithCoupling.remove(uuid);
 		}
 	}