diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientPlayNetworkHandlerMixin.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientPlayNetworkHandlerMixin.java index dacf8d77e..8e2998e07 100644 --- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientPlayNetworkHandlerMixin.java +++ b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientPlayNetworkHandlerMixin.java @@ -49,8 +49,11 @@ protected ClientPlayNetworkHandlerMixin(Minecraft client, Connection connection, @Inject(method = "", at = @At("RETURN")) private void initAddon(CallbackInfo ci) { - Set channels = ChannelAttributes.getOrCreateCommonChannels(this.getConnection(), this.protocol()); - NeoClientCommonNetworking.onRegisterPacket((ClientPacketListener) (Object) this, channels); + Connection connection = this.getConnection(); + if (connection != null && connection.channel() != null) { + Set channels = ChannelAttributes.getOrCreateCommonChannels(connection, this.protocol()); + NeoClientCommonNetworking.onRegisterPacket((ClientPacketListener) (Object) this, channels); + } NeoClientPlayNetworking.setTempPacketListener((ClientPacketListener) (Object) this); ClientPlayConnectionEvents.INIT.invoker().onPlayInit((ClientPacketListener) (Object) this, this.minecraft);