Fix execution and carry cleanup

2026-01-20 09:30:07 +01:00
parent 40d99d4c13
commit a0a9f59250
2 changed files with 37 additions and 7 deletions
@@ -89,11 +89,19 @@ public class CarryManager {
        }
        for (UUID kid : toDrop) {
            UUID cid = carrying.get(kid);
+            if (cid == null) {
+                carrying.remove(kid);
+                continue;
+            }
            ServerPlayer carrier = NetworkHandlerHelper.getPlayerByUuid(
                    net.minecraftforge.server.ServerLifecycleHooks.getCurrentServer(), cid);
            ServerPlayer knocked = NetworkHandlerHelper.getPlayerByUuid(
                    net.minecraftforge.server.ServerLifecycleHooks.getCurrentServer(), kid);
-            if (carrier != null && knocked != null) stopCarry(knocked, carrier);
+            if (carrier != null && knocked != null) {
+                stopCarry(knocked, carrier);
+            } else {
+                carrying.remove(kid);
+            }
        }
    }

@@ -124,4 +132,4 @@ public class CarryManager {
    public static boolean isBeingCarried(UUID knockedId) {
        return carrying.containsKey(knockedId);
    }
-}
+}