diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java index 1628e75cd..5d3bf958a 100644 --- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java +++ b/fabric-networking-api-v1/src/client/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 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/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientPlayNetworking.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientPlayNetworking.java index 0039865dc..f4017d632 100644 --- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientPlayNetworking.java +++ b/fabric-networking-api-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 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 index 273d5921b..2ab4eb7cf 100644 --- 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