Fix InnerGameData

diff --git a/src/Impostor.Server/GameData/Objects/InnerGameData.PlayerInfo.cs b/src/Impostor.Server/GameData/Objects/InnerGameData.PlayerInfo.cs
index 3e1f9de1c2da9bb07fa0172e5eaf6c064a6f1fbb..1283e2bee8064ec51a387af751bdf0716124cdf4 100644 (file)
--- 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 bbce83d69316eaca7398e7db8d5908bbf2af1773..87a196fe13e634de66f056d893321f6d5c459d33 100644 (file)
--- 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);
+                //     }
+                // }
             }
         }
     }