From d35cb4ed723d9699995d2bb61a745b48499fd84c Mon Sep 17 00:00:00 2001
From: Hanro50 <hlareman2@gmail.com>
Date: Wed, 15 Oct 2025 22:03:28 +0200
Subject: [PATCH] Bug fixes

- Ports fabric disconnect fix to neoforge
- Fixes console error when trying to pickup non owned tamable mobs.
---
 .../tschipp/carryon/common/carry/PickupHandler.java | 13 +++++++++----
 .../carryon/carry/CarryOnDataSyncHandler.java       |  6 +++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java b/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java
index ff0fed8..4d14f3f 100644
--- a/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java
+++ b/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java
@@ -32,6 +32,8 @@ import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.AgeableMob;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.Entity.RemovalReason;
+import net.minecraft.world.entity.EntityReference;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.entity.TamableAnimal;
 import net.minecraft.world.entity.animal.Animal;
@@ -172,10 +174,13 @@ public class PickupHandler {
 
         if (entity instanceof TamableAnimal tame)
         {
-            UUID owner = tame.getOwnerReference().getUUID();
-            UUID playerID = player.getGameProfile().id();
-            if (owner != null && !owner.equals(playerID))
-                return false;
+            EntityReference<LivingEntity> ref  = tame.getOwnerReference();
+            if (ref != null) {
+                UUID owner = tame.getOwnerReference().getUUID();
+                UUID playerID = player.getGameProfile().id();
+                if (!owner.equals(playerID))
+                    return false;
+            }
         }
 
         if(!ListHandler.isPermitted(entity))
diff --git a/NeoForge/src/main/java/tschipp/carryon/carry/CarryOnDataSyncHandler.java b/NeoForge/src/main/java/tschipp/carryon/carry/CarryOnDataSyncHandler.java
index edc005f..3f9b4d7 100644
--- a/NeoForge/src/main/java/tschipp/carryon/carry/CarryOnDataSyncHandler.java
+++ b/NeoForge/src/main/java/tschipp/carryon/carry/CarryOnDataSyncHandler.java
@@ -20,7 +20,11 @@ public class CarryOnDataSyncHandler implements AttachmentSyncHandler<CarryOnData
 
     @Override
     public boolean sendToPlayer(IAttachmentHolder holder, ServerPlayer to) {
-        if (to.connection == null || to.isRemoved())
+        ServerPlayer player = (ServerPlayer) holder;
+        // the isAlive check avoids us syncing attachment data about dead players. Which causes a disconnect
+        // player.tickCount <= 0 avoids us syncing attachment data about players the instant they spawn. 
+        // Which also causes a disconnect as the player entity may not be synced yet.
+        if (to.connection == null || !player.isAlive() || player.tickCount <= 0)
             return false;
         return AttachmentSyncHandler.super.sendToPlayer(holder, to);
     }