helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix all warnings & Trim (#2226)

Browse source 
* Fix AutoFishing crash
* Fix all warnings
* Remove DotNetZip.
* Fix the usage of HttpClient.
This commit is contained in:
BruceChen 2022-10-02 18:31:08 +08:00 • committed by GitHub
parent 4aa6c1c99f
commit 1d52d1eadd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
227 changed files with 2201 additions and 43564 deletions
Download patch file Download diff file Expand all files Collapse all files

24
MinecraftClient/Protocol/Handlers/SocketWrapper.cs
View file

@ -9,8 +9,8 @@ namespace MinecraftClient.Protocol.Handlers
/// </summary>
class SocketWrapper
{
TcpClient c;
AesCfb8Stream s;
readonly TcpClient c;
AesCfb8Stream? s;
bool encrypted = false;
/// <summary>
@ -19,7 +19,7 @@ namespace MinecraftClient.Protocol.Handlers
/// <param name="client">TcpClient connected to the server</param>
public SocketWrapper(TcpClient client)
{
this.c = client;
c = client;
}
/// <summary>
@ -49,8 +49,8 @@ namespace MinecraftClient.Protocol.Handlers
{
if (encrypted)
throw new InvalidOperationException("Stream is already encrypted!?");
this.s = new AesCfb8Stream(c.GetStream(), secretKey);
this.encrypted = true;
s = new AesCfb8Stream(c.GetStream(), secretKey);
encrypted = true;
}
/// <summary>
@ -62,10 +62,9 @@ namespace MinecraftClient.Protocol.Handlers
while (read < offset)
{
if (encrypted)
{
read += s.Read(buffer, start + read, offset - read);
}
else read += c.Client.Receive(buffer, start + read, offset - read, f);
read += s!.Read(buffer, start + read, offset - read);
else
read += c.Client.Receive(buffer, start + read, offset - read, f);
}
}
@ -92,10 +91,9 @@ namespace MinecraftClient.Protocol.Handlers
public void SendDataRAW(byte[] buffer)
{
if (encrypted)
{
s.Write(buffer, 0, buffer.Length);
}
else c.Client.Send(buffer);
s!.Write(buffer, 0, buffer.Length);
else
c.Client.Send(buffer);
}
/// <summary>