From d11b7e11aa2c482b8675be4f2fd069d3b1ed1eda Mon Sep 17 00:00:00 2001 From: Soreepeong Date: Fri, 16 Sep 2022 17:10:12 +0900 Subject: [PATCH] Fix ReadFileBlock (NotAdam/Lumina#42) --- Penumbra/Util/PenumbraSqPackStream.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Penumbra/Util/PenumbraSqPackStream.cs b/Penumbra/Util/PenumbraSqPackStream.cs index 017d70c6..7bb0687d 100644 --- a/Penumbra/Util/PenumbraSqPackStream.cs +++ b/Penumbra/Util/PenumbraSqPackStream.cs @@ -334,14 +334,13 @@ public class PenumbraSqPackStream : IDisposable if( blockHeader.CompressedSize == 32000 ) { dest.Write( Reader.ReadBytes( ( int )blockHeader.UncompressedSize ) ); - return blockHeader.UncompressedSize; } - - var data = Reader.ReadBytes( ( int )blockHeader.CompressedSize ); - - using( var compressedStream = new MemoryStream( data ) ) + else { - using var zlibStream = new DeflateStream( compressedStream, CompressionMode.Decompress ); + var data = Reader.ReadBytes( ( int )blockHeader.CompressedSize ); + + using var compressedStream = new MemoryStream( data ); + using var zlibStream = new DeflateStream( compressedStream, CompressionMode.Decompress ); zlibStream.CopyTo( dest ); }