Fix client networking canSend checks

Relates to Sinytra/Connector#1297
Sinytra · Aug 9, 2024 · 28b204f · 28b204f
1 parent c85e22a
commit 28b204f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/...ient/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java b/...ient/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java
@@ -18,6 +18,7 @@
 
 import java.util.Set;
 
+import net.minecraft.network.ConnectionProtocol;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 import net.fabricmc.fabric.api.networking.v1.PacketSender;
@@ -157,7 +158,11 @@ public static Set<ResourceLocation> getSendable() throws IllegalStateException {
 	 * False if the client is not in game.
 	 */
 	public static boolean canSend(ResourceLocation channelName) throws IllegalArgumentException {
-		return NeoClientConfigurationNetworking.canSend(channelName);
+		if (Minecraft.getInstance().getConnection() != null && Minecraft.getInstance().getConnection().protocol() == ConnectionProtocol.CONFIGURATION) {
+			return NeoClientConfigurationNetworking.canSend(channelName);
+		}
+
+		return false;
 	}
 
 	/**

diff --git a/...v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientPlayNetworking.java b/...v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientPlayNetworking.java
@@ -19,6 +19,7 @@
 import java.util.Objects;
 import java.util.Set;
 
+import net.minecraft.network.ConnectionProtocol;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 import net.fabricmc.fabric.api.networking.v1.PacketSender;
@@ -161,7 +162,7 @@ public static Set<ResourceLocation> getSendable() throws IllegalStateException {
 	 */
 	public static boolean canSend(ResourceLocation channelName) throws IllegalArgumentException {
 		// You cant send without a client player, so this is fine
-		if (Minecraft.getInstance().getConnection() != null) {
+		if (Minecraft.getInstance().getConnection() != null && Minecraft.getInstance().getConnection().protocol() == ConnectionProtocol.PLAY) {
 			return NeoClientPlayNetworking.canSend(channelName);
 		}
 

diff --git a/ffapi.gradle.properties b/ffapi.gradle.properties
@@ -1,7 +1,7 @@
 loom.platform=neoforge
 fabric.loom.dontRemap=true
 
-implementationVersion=2.0.9
+implementationVersion=2.0.10
 
 versionMc=1.21
 versionForge=21.0.160