etc/SmoOnlineServer
0
0
Fork 0
mirror of https://github.com/Sanae6/SmoOnlineServer.git synced 2024-11-22 03:05:16 +00:00
Code Issues Projects Releases Wiki Activity

Remove test exception when disconnecting

Browse source
This commit is contained in:
Sanae 2022-03-13 15:27:53 -06:00
parent c778d15644
commit 217dc2765e
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Server/Server.cs
View file

@ -136,7 +136,7 @@ public class Server {
} }
if (!await Read(memory.Memory[..Constants.HeaderSize], Constants.HeaderSize, 0)) 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]); PacketHeader header = GetHeader(memory.Memory.Span[..Constants.HeaderSize]);
Range packetRange = Constants.HeaderSize..(Constants.HeaderSize + header.PacketSize); Range packetRange = Constants.HeaderSize..(Constants.HeaderSize + header.PacketSize);
if (header.PacketSize > 0) { if (header.PacketSize > 0) {
@ -145,7 +145,7 @@ public class Server {
memTemp.Memory.Span[..Constants.HeaderSize].CopyTo(memory.Memory.Span[..Constants.HeaderSize]); memTemp.Memory.Span[..Constants.HeaderSize].CopyTo(memory.Memory.Span[..Constants.HeaderSize]);
memTemp.Dispose(); memTemp.Dispose();
if (!await Read(memory.Memory, header.PacketSize, Constants.HeaderSize)) 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}"); // 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}");

6
Shared/Packet/Packets/GamePacket.cs
View file

@ -10,6 +10,12 @@ public struct GamePacket : IPacket {
public byte ScenarioNum; public byte ScenarioNum;
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = StageSize)] [MarshalAs(UnmanagedType.ByValTStr, SizeConst = StageSize)]
public string Stage = ""; public string Stage = "";
public GamePacket() {
Is2d = false;
ScenarioNum = 0;
}
public short Size => 0x32; public short Size => 0x32;
public void Serialize(Span<byte> data) { public void Serialize(Span<byte> data) {
MemoryMarshal.Write(data[..0], ref Is2d); MemoryMarshal.Write(data[..0], ref Is2d);