From 6c075a48274e184288fa645de36402ff925adf37 Mon Sep 17 00:00:00 2001 From: AeonLucid Date: Fri, 16 Oct 2020 06:23:09 +0200 Subject: [PATCH] Fix InnerGameData --- .../Objects/InnerGameData.PlayerInfo.cs | 3 ++ .../GameData/Objects/InnerGameData.cs | 36 +++++++++---------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/Impostor.Server/GameData/Objects/InnerGameData.PlayerInfo.cs b/src/Impostor.Server/GameData/Objects/InnerGameData.PlayerInfo.cs index 3e1f9de..1283e2b 100644 --- a/src/Impostor.Server/GameData/Objects/InnerGameData.PlayerInfo.cs +++ b/src/Impostor.Server/GameData/Objects/InnerGameData.PlayerInfo.cs @@ -21,6 +21,8 @@ namespace Impostor.Server.GameData.Objects public uint HatId { get; private set; } + public uint PetId { get; private set; } + public uint SkinId { get; private set; } public bool Disconnected { get; private set; } @@ -41,6 +43,7 @@ namespace Impostor.Server.GameData.Objects PlayerName = reader.ReadString(); ColorId = reader.ReadByte(); HatId = reader.ReadPackedUInt32(); + PetId = reader.ReadPackedUInt32(); SkinId = reader.ReadPackedUInt32(); var flag = reader.ReadByte(); Disconnected = (flag & 1) > 0; diff --git a/src/Impostor.Server/GameData/Objects/InnerGameData.cs b/src/Impostor.Server/GameData/Objects/InnerGameData.cs index bbce83d..87a196f 100644 --- a/src/Impostor.Server/GameData/Objects/InnerGameData.cs +++ b/src/Impostor.Server/GameData/Objects/InnerGameData.cs @@ -47,8 +47,6 @@ namespace Impostor.Server.GameData.Objects { if (initialState) { - var gameGuid = reader.ReadBytesAndSize(); - // var gameGuid = new Guid(reader.ReadBytesAndSize().Span); var num = reader.ReadPackedInt32(); for (var i = 0; i < num; i++) @@ -60,23 +58,25 @@ namespace Impostor.Server.GameData.Objects } else { - var num = reader.ReadByte(); + throw new NotImplementedException("This shouldn't happen, according to Among Us assembly.."); - for (var i = 0; i < num; i++) - { - var id = reader.ReadByte(); - var player = GetPlayerById(id); - if (player != null) - { - player.Deserialize(reader); - } - else - { - var playerInfo = new PlayerInfo(id); - playerInfo.Deserialize(reader); - _allPlayers.Add(playerInfo); - } - } + // var num = reader.ReadByte(); + // + // for (var i = 0; i < num; i++) + // { + // var id = reader.ReadByte(); + // var player = GetPlayerById(id); + // if (player != null) + // { + // player.Deserialize(reader); + // } + // else + // { + // var playerInfo = new PlayerInfo(id); + // playerInfo.Deserialize(reader); + // _allPlayers.Add(playerInfo); + // } + // } } } } -- 2.39.5