From 9d6ffc37ca7a6495aa7b29236803c5c12c28436f Mon Sep 17 00:00:00 2001
From: Hanro50 <hlareman2@gmail.com>
Date: Wed, 15 Oct 2025 09:11:08 +0200
Subject: [PATCH] Fixes kick on death on neoforge

---
 Common/build.gradle                           |  2 +-
 NeoForge/build.gradle                         |  2 +-
 .../carryon/carry/CarryOnDataSyncHandler.java |  2 +-
 gradle.properties                             | 19 ++++++++++---------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Common/build.gradle b/Common/build.gradle
index 2890640..4916994 100644
--- a/Common/build.gradle
+++ b/Common/build.gradle
@@ -20,7 +20,7 @@ neoForge {
         accessTransformers.from(at.absolutePath)
     }
     parchment {
-        minecraftVersion = minecraft_version
+        minecraftVersion = parchment_game_version
         mappingsVersion = parchment_version
     }
 }
diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle
index 895e732..91d6424 100644
--- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle
@@ -20,7 +20,7 @@ neoForge {
         accessTransformers.from(at.absolutePath)
     }
     parchment {
-        minecraftVersion = minecraft_version
+        minecraftVersion = parchment_game_version
         mappingsVersion = parchment_version
     }
     runs {
diff --git a/NeoForge/src/main/java/tschipp/carryon/carry/CarryOnDataSyncHandler.java b/NeoForge/src/main/java/tschipp/carryon/carry/CarryOnDataSyncHandler.java
index 16fa62f..edc005f 100644
--- a/NeoForge/src/main/java/tschipp/carryon/carry/CarryOnDataSyncHandler.java
+++ b/NeoForge/src/main/java/tschipp/carryon/carry/CarryOnDataSyncHandler.java
@@ -20,7 +20,7 @@ public class CarryOnDataSyncHandler implements AttachmentSyncHandler<CarryOnData
 
     @Override
     public boolean sendToPlayer(IAttachmentHolder holder, ServerPlayer to) {
-        if (to.connection == null)
+        if (to.connection == null || to.isRemoved())
             return false;
         return AttachmentSyncHandler.super.sendToPlayer(holder, to);
     }
diff --git a/gradle.properties b/gradle.properties
index 1995668..6d93b83 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,34 +3,35 @@ version=2.7.0
 group=tschipp.carryon
 
 # Common
-minecraft_version=1.21.9
+minecraft_version=1.21.10
 mod_name=Carry On
 mod_author=Tschipp, PurpliciousCow
 mod_id=carryon
 license=GNU LGPLv3
 credits=
 description=Carry On is a simple mod that improves game interaction by allowing players to pick up, carry, and place single block Tile Entities using only their empty hands.
-minecraft_version_range=[1.21.9, 1.22)
-neo_form_version=1.21.9-20250930.151910
+minecraft_version_range=[1.21.10, 1.22)
+neo_form_version=1.21.10-20251010.172816
 java_version=21
 parchment_version=2025.10.05
+parchment_game_version=1.21.9
 mod_dev_version=2.0.107
 # Forge
-forge_version=59.0.5
-forge_loader_version_range=[59,)
+forge_version=60.0.5
+forge_loader_version_range=[60,)
 parchment_mappings=2025.10.05-1.21.9
 //forge_ats_enabled=true
 
 # Fabric
-fabric_version=0.134.0+1.21.9
+fabric_version=0.135.0+1.21.10
 fabric_loader_version=0.17.3
 parchment_mappings_fabric=1.21.9:2025.10.05
 loom_version=1.11-SNAPSHOT
 
 # Neoforge
-neoforge_version=21.9.16-beta
+neoforge_version=21.10.16-beta
 neoforge_loader_version_range=[4,)
-neogradle.subsystems.parchment.minecraftVersion=1.21.9
+neogradle.subsystems.parchment.minecraftVersion=1.21.10
 neogradle.subsystems.parchment.mappingsVersion=2025.10.05
 
 
@@ -38,5 +39,5 @@ neogradle.subsystems.parchment.mappingsVersion=2025.10.05
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-mixinextras_version=0.3.6
+mixinextras_version=0.5.0
 cloth_config_version=20.0.148
\ No newline at end of file