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

Fixed a crash on Explosion packet

Browse source
This commit is contained in:
Milutinke 2022-09-18 01:15:57 +02:00
parent 59e02c2da9
commit 1e07fa576a
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1540,16 +1540,20 @@ namespace MinecraftClient.Protocol.Handlers
handler.OnSetExperience(experiencebar, level, totalexperience); handler.OnSetExperience(experiencebar, level, totalexperience);
break; break;
case PacketTypesIn.Explosion: case PacketTypesIn.Explosion:
Location explosionLocation; Location explosionLocation = new(dataTypes.ReadNextFloat(packetData), dataTypes.ReadNextFloat(packetData), dataTypes.ReadNextFloat(packetData));
if (protocolVersion >= MC_1_19_Version)
explosionLocation = new(dataTypes.ReadNextDouble(packetData), dataTypes.ReadNextDouble(packetData), dataTypes.ReadNextDouble(packetData));
else
explosionLocation = new(dataTypes.ReadNextFloat(packetData), dataTypes.ReadNextFloat(packetData), dataTypes.ReadNextFloat(packetData));
float explosionStrength = dataTypes.ReadNextFloat(packetData); float explosionStrength = dataTypes.ReadNextFloat(packetData);
int explosionBlockCount = protocolVersion >= MC_1_17_Version int explosionBlockCount = protocolVersion >= MC_1_17_Version
? dataTypes.ReadNextVarInt(packetData) ? dataTypes.ReadNextVarInt(packetData)
: dataTypes.ReadNextInt(packetData); : dataTypes.ReadNextInt(packetData);
// Ignoring additional fields (records, pushback)
for (int i = 0; i < explosionBlockCount; i++)
dataTypes.ReadData(3, packetData);
float playerVelocityX = dataTypes.ReadNextFloat(packetData);
float playerVelocityY = dataTypes.ReadNextFloat(packetData);
float playerVelocityZ = dataTypes.ReadNextFloat(packetData);
handler.OnExplosion(explosionLocation, explosionStrength, explosionBlockCount); handler.OnExplosion(explosionLocation, explosionStrength, explosionBlockCount);
break; break;
case PacketTypesIn.HeldItemChange: case PacketTypesIn.HeldItemChange:
@ -1657,7 +1661,8 @@ namespace MinecraftClient.Protocol.Handlers
{ {
netMain.Item2.Cancel(); netMain.Item2.Cancel();
} }
if (netReader != null){ if (netReader != null)
{
netReader.Item2.Cancel(); netReader.Item2.Cancel();
socketWrapper.Disconnect(); socketWrapper.Disconnect();
} }