(6eeea9b7c) v0.9.10.0.0

This commit is contained in:
Joonas Rikkonen
2020-06-04 16:41:07 +03:00
parent ce4ccd99ac
commit eeac247a8e
366 changed files with 7772 additions and 3692 deletions
@@ -1,7 +1,7 @@
using Lidgren.Network;
using System;
using System.Collections.Generic;
using System.IO;
using Barotrauma.IO;
using System.IO.Compression;
using System.Runtime.InteropServices;
using System.Text;
@@ -519,7 +519,7 @@ namespace Barotrauma.Networking
}
else
{
using (MemoryStream output = new MemoryStream())
using (System.IO.MemoryStream output = new System.IO.MemoryStream())
{
using (DeflateStream dstream = new DeflateStream(output, CompressionLevel.Fastest))
{
@@ -613,9 +613,9 @@ namespace Barotrauma.Networking
if (isCompressed)
{
byte[] decompressedData;
using (MemoryStream input = new MemoryStream(inBuf, startPos, inLength))
using (System.IO.MemoryStream input = new System.IO.MemoryStream(inBuf, startPos, inLength))
{
using (MemoryStream output = new MemoryStream())
using (System.IO.MemoryStream output = new System.IO.MemoryStream())
{
using (DeflateStream dstream = new DeflateStream(input, CompressionMode.Decompress))
{