helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-11-07 17:36:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce conflict

Browse source
This commit is contained in:
BruceChen 2023-01-14 15:58:36 +08:00
parent e0294f1beb
commit de9b47b2d9
1 changed files with 1538 additions and 1536 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -329,10 +329,8 @@ namespace MinecraftClient.Protocol.Handlers
/// <returns>TRUE if the packet was processed, FALSE if ignored or unknown</returns> /// <returns>TRUE if the packet was processed, FALSE if ignored or unknown</returns>
internal bool HandlePacket(int packetID, Queue<byte> packetData) internal bool HandlePacket(int packetID, Queue<byte> packetData)
{ {
#if Release
try try
{ {
#endif
if (login_phase) if (login_phase)
{ {
switch (packetID) //Packet IDs are different while logging in switch (packetID) //Packet IDs are different while logging in
@ -1984,8 +1982,8 @@ namespace MinecraftClient.Protocol.Handlers
return false; //Ignored packet return false; //Ignored packet
} }
return true; //Packet processed return true; //Packet processed
#if Release
} }
#if Release
catch (Exception innerException) catch (Exception innerException)
{ {
if (innerException is ThreadAbortException || innerException is SocketException || innerException.InnerException is SocketException) if (innerException is ThreadAbortException || innerException is SocketException || innerException.InnerException is SocketException)
@ -1999,6 +1997,10 @@ namespace MinecraftClient.Protocol.Handlers
innerException.GetType()), innerException.GetType()),
innerException); innerException);
} }
#else
catch (SocketException) { }
catch (ThreadAbortException) { }
catch (ObjectDisposedException) { }
#endif #endif
} }