From 217dc2765ee46b8c068a4f1ee5faf5a0e3d3e231 Mon Sep 17 00:00:00 2001 From: Sanae Date: Sun, 13 Mar 2022 15:27:53 -0600 Subject: [PATCH] Remove test exception when disconnecting --- Server/Server.cs | 4 ++-- Shared/Packet/Packets/GamePacket.cs | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Server/Server.cs b/Server/Server.cs index 8a21174..c277999 100644 --- a/Server/Server.cs +++ b/Server/Server.cs @@ -136,7 +136,7 @@ public class Server { } if (!await Read(memory.Memory[..Constants.HeaderSize], Constants.HeaderSize, 0)) - throw new Exception("Not enough bytes for packet header sent to server"); + break; PacketHeader header = GetHeader(memory.Memory.Span[..Constants.HeaderSize]); Range packetRange = Constants.HeaderSize..(Constants.HeaderSize + header.PacketSize); if (header.PacketSize > 0) { @@ -145,7 +145,7 @@ public class Server { memTemp.Memory.Span[..Constants.HeaderSize].CopyTo(memory.Memory.Span[..Constants.HeaderSize]); memTemp.Dispose(); if (!await Read(memory.Memory, header.PacketSize, Constants.HeaderSize)) - throw new Exception("Not enough bytes for packet data sent to server"); + break; } // if (header.Type is not PacketType.Player and not PacketType.Cap and not PacketType.Capture)Logger.Info($"Got your mom {header.Id} {header.Type} 0x{header.PacketSize:X} 0x{memory.Memory.Length:X} 0x{header.Size:X}"); diff --git a/Shared/Packet/Packets/GamePacket.cs b/Shared/Packet/Packets/GamePacket.cs index b2aac1f..d288682 100644 --- a/Shared/Packet/Packets/GamePacket.cs +++ b/Shared/Packet/Packets/GamePacket.cs @@ -10,6 +10,12 @@ public struct GamePacket : IPacket { public byte ScenarioNum; [MarshalAs(UnmanagedType.ByValTStr, SizeConst = StageSize)] public string Stage = ""; + + public GamePacket() { + Is2d = false; + ScenarioNum = 0; + } + public short Size => 0x32; public void Serialize(Span data) { MemoryMarshal.Write(data[..0], ref Is2d);