From 5c718485aed342ab539b0b7a8c7cd900c0d486d4 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Mon, 10 Dec 2018 16:09:31 +0200 Subject: [PATCH] Write permissions as UInt16 instead of byte (too many permissions to write as byte anymore) --- .../Source/Networking/GameClient.cs | 16 ++++++++-------- .../Source/Networking/GameServer.cs | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs b/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs index 8f2d15a30..67563c99a 100644 --- a/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs +++ b/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs @@ -1502,7 +1502,7 @@ namespace Barotrauma.Networking { NetOutgoingMessage msg = client.CreateMessage(); msg.Write((byte)ClientPacketHeader.SERVER_COMMAND); - msg.Write((byte)ClientPermissions.Kick); + msg.Write((UInt16)ClientPermissions.Kick); msg.Write(kickedName); msg.Write(reason); @@ -1513,7 +1513,7 @@ namespace Barotrauma.Networking { NetOutgoingMessage msg = client.CreateMessage(); msg.Write((byte)ClientPacketHeader.SERVER_COMMAND); - msg.Write((byte)ClientPermissions.Ban); + msg.Write((UInt16)ClientPermissions.Ban); msg.Write(kickedName); msg.Write(reason); msg.Write(range); @@ -1526,7 +1526,7 @@ namespace Barotrauma.Networking { NetOutgoingMessage msg = client.CreateMessage(); msg.Write((byte)ClientPacketHeader.SERVER_COMMAND); - msg.Write((byte)ClientPermissions.Unban); + msg.Write((UInt16)ClientPermissions.Unban); msg.Write(string.IsNullOrEmpty(playerName) ? "" : playerName); msg.Write(string.IsNullOrEmpty(playerIP) ? "" : playerIP); client.SendMessage(msg, NetDeliveryMethod.ReliableUnordered); @@ -1543,7 +1543,7 @@ namespace Barotrauma.Networking NetOutgoingMessage msg = client.CreateMessage(); msg.Write((byte)ClientPacketHeader.SERVER_COMMAND); - msg.Write((byte)ClientPermissions.ManageCampaign); + msg.Write((UInt16)ClientPermissions.ManageCampaign); campaign.ClientWrite(msg); msg.Write((byte)ServerNetObject.END_OF_MESSAGE); @@ -1560,7 +1560,7 @@ namespace Barotrauma.Networking NetOutgoingMessage msg = client.CreateMessage(); msg.Write((byte)ClientPacketHeader.SERVER_COMMAND); - msg.Write((byte)ClientPermissions.ConsoleCommands); + msg.Write((UInt16)ClientPermissions.ConsoleCommands); msg.Write(command); Vector2 cursorWorldPos = GameMain.GameScreen.Cam.ScreenToWorld(PlayerInput.MousePosition); msg.Write(cursorWorldPos.X); @@ -1583,7 +1583,7 @@ namespace Barotrauma.Networking NetOutgoingMessage msg = client.CreateMessage(); msg.Write((byte)ClientPacketHeader.SERVER_COMMAND); - msg.Write((byte)ClientPermissions.SelectSub); + msg.Write((UInt16)ClientPermissions.SelectSub); msg.Write((UInt16)subIndex); msg.Write((byte)ServerNetObject.END_OF_MESSAGE); @@ -1604,7 +1604,7 @@ namespace Barotrauma.Networking NetOutgoingMessage msg = client.CreateMessage(); msg.Write((byte)ClientPacketHeader.SERVER_COMMAND); - msg.Write((byte)ClientPermissions.SelectMode); + msg.Write((UInt16)ClientPermissions.SelectMode); msg.Write((UInt16)modeIndex); msg.Write((byte)ServerNetObject.END_OF_MESSAGE); @@ -1618,7 +1618,7 @@ namespace Barotrauma.Networking { NetOutgoingMessage msg = client.CreateMessage(); msg.Write((byte)ClientPacketHeader.SERVER_COMMAND); - msg.Write((byte)ClientPermissions.EndRound); + msg.Write((UInt16)ClientPermissions.EndRound); client.SendMessage(msg, NetDeliveryMethod.ReliableUnordered); } diff --git a/Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs b/Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs index c486695d5..095ecdb01 100644 --- a/Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs +++ b/Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs @@ -826,7 +826,7 @@ namespace Barotrauma.Networking ClientPermissions command = ClientPermissions.None; try { - command = (ClientPermissions)inc.ReadByte(); + command = (ClientPermissions)inc.ReadUInt16(); } catch