From 763a76cb25b9ce6f2527e8c6e0084a5250de868a Mon Sep 17 00:00:00 2001 From: sorokya Date: Sat, 26 Mar 2022 08:49:48 +0100 Subject: [PATCH] create overload for AddShort that accepts ushort --- EOLib/Domain/Account/AccountActions.cs | 2 +- EOLib/Net/Connection/NetworkConnectionActions.cs | 2 +- EOLib/Net/FileTransfer/FileRequestService.cs | 6 +++--- EOLib/Net/IPacketBuilder.cs | 2 ++ EOLib/Net/PacketBuilder.cs | 7 ++++++- EOLib/PacketHandlers/BeginPlayerWarpHandler.cs | 2 +- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/EOLib/Domain/Account/AccountActions.cs b/EOLib/Domain/Account/AccountActions.cs index c3e7f2b0e..ab93c494c 100644 --- a/EOLib/Domain/Account/AccountActions.cs +++ b/EOLib/Domain/Account/AccountActions.cs @@ -93,7 +93,7 @@ public async Task CheckAccountNameWithServer(string accountName) public async Task CreateAccount(ICreateAccountParameters parameters) { var createAccountPacket = new PacketBuilder(PacketFamily.Account, PacketAction.Create) - .AddShort(_playerInfoRepository.SessionID) + .AddShort((ushort)_playerInfoRepository.SessionID) .AddByte(255) .AddBreakString(parameters.AccountName) .AddBreakString(parameters.Password) diff --git a/EOLib/Net/Connection/NetworkConnectionActions.cs b/EOLib/Net/Connection/NetworkConnectionActions.cs index 77b0917b4..5327cfebd 100644 --- a/EOLib/Net/Connection/NetworkConnectionActions.cs +++ b/EOLib/Net/Connection/NetworkConnectionActions.cs @@ -114,7 +114,7 @@ public void CompleteHandshake(IInitializationData initializationData) var packet = new PacketBuilder(PacketFamily.Connection, PacketAction.Accept) .AddShort((short)initializationData[InitializationDataKey.SendMultiple]) .AddShort((short)initializationData[InitializationDataKey.ReceiveMultiple]) - .AddShort(_playerInfoRepository.PlayerID) + .AddShort((ushort)_playerInfoRepository.PlayerID) .Build(); _packetSendService.SendPacket(packet); diff --git a/EOLib/Net/FileTransfer/FileRequestService.cs b/EOLib/Net/FileTransfer/FileRequestService.cs index 5b8ae1a1c..1575897fe 100644 --- a/EOLib/Net/FileTransfer/FileRequestService.cs +++ b/EOLib/Net/FileTransfer/FileRequestService.cs @@ -30,7 +30,7 @@ public async Task RequestMapFile(short mapID, short sessionID) { var request = new PacketBuilder(PacketFamily.Welcome, PacketAction.Agree) .AddChar((byte)InitFileType.Map) - .AddShort(sessionID) + .AddShort((ushort)sessionID) .AddShort(mapID) .Build(); @@ -41,7 +41,7 @@ public async Task RequestMapFileForWarp(short mapID, short sessionID) { var request = new PacketBuilder(PacketFamily.Warp, PacketAction.Take) .AddShort(mapID) - .AddShort(sessionID) + .AddShort((ushort)sessionID) .Build(); return await GetMapFile(request, mapID); @@ -52,7 +52,7 @@ public async Task> RequestFile(InitFileType fileType, { var request = new PacketBuilder(PacketFamily.Welcome, PacketAction.Agree) .AddChar((byte)fileType) - .AddShort(sessionID) + .AddShort((ushort)sessionID) .AddChar(1) // file id (for chunking oversize pub files) .Build(); diff --git a/EOLib/Net/IPacketBuilder.cs b/EOLib/Net/IPacketBuilder.cs index 78fa5dd86..b546873d6 100644 --- a/EOLib/Net/IPacketBuilder.cs +++ b/EOLib/Net/IPacketBuilder.cs @@ -22,6 +22,8 @@ public interface IPacketBuilder IPacketBuilder AddShort(short s); + IPacketBuilder AddShort(ushort s); + IPacketBuilder AddThree(int t); IPacketBuilder AddInt(int i); diff --git a/EOLib/Net/PacketBuilder.cs b/EOLib/Net/PacketBuilder.cs index 94e615e89..721527717 100644 --- a/EOLib/Net/PacketBuilder.cs +++ b/EOLib/Net/PacketBuilder.cs @@ -67,7 +67,12 @@ public IPacketBuilder AddChar(byte b) public IPacketBuilder AddShort(short s) { - return AddBytes(_encoderService.EncodeNumber((ushort)s, 2)); + return AddBytes(_encoderService.EncodeNumber(s, 2)); + } + + public IPacketBuilder AddShort(ushort s) + { + return AddBytes(_encoderService.EncodeNumber(s, 2)); } public IPacketBuilder AddThree(int t) diff --git a/EOLib/PacketHandlers/BeginPlayerWarpHandler.cs b/EOLib/PacketHandlers/BeginPlayerWarpHandler.cs index c836f13fc..b05ec4562 100644 --- a/EOLib/PacketHandlers/BeginPlayerWarpHandler.cs +++ b/EOLib/PacketHandlers/BeginPlayerWarpHandler.cs @@ -88,7 +88,7 @@ private void SendWarpAcceptToServer(short mapID, short sessionID) { var response = new PacketBuilder(PacketFamily.Warp, PacketAction.Accept) .AddShort(mapID) - .AddShort(sessionID) + .AddShort((ushort)sessionID) .Build(); _packetSendService.SendPacket(response); }