From fedd332e0e0af5eb56d0107a9d9e1da38ebc418e Mon Sep 17 00:00:00 2001
From: compujuckel <compujuckel@users.noreply.github.com>
Date: Sat, 14 Sep 2024 14:59:58 +0200
Subject: [PATCH] get rid of some warnings

---
 .../Network/Packets/Outgoing/CarListResponse.cs          | 2 +-
 AssettoServer/AssettoServer.csproj                       | 9 ++++++++-
 AssettoServer/Network/Tcp/ACTcpClient.cs                 | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/AssettoServer.Shared/Network/Packets/Outgoing/CarListResponse.cs b/AssettoServer.Shared/Network/Packets/Outgoing/CarListResponse.cs
index 9f038cd6..5fe8bc0f 100644
--- a/AssettoServer.Shared/Network/Packets/Outgoing/CarListResponse.cs
+++ b/AssettoServer.Shared/Network/Packets/Outgoing/CarListResponse.cs
@@ -7,7 +7,7 @@ public class CarListResponse : IOutgoingNetworkPacket
     public int PageIndex;
     public int EntryCarsCount;
     public required IEnumerable<IEntryCar<IClient>> EntryCars;
-    public Dictionary<byte, EntryCarResult> CarResults;
+    public required Dictionary<byte, EntryCarResult> CarResults;
 
     public void ToWriter(ref PacketWriter writer)
     {
diff --git a/AssettoServer/AssettoServer.csproj b/AssettoServer/AssettoServer.csproj
index 47b962c3..e72482f8 100644
--- a/AssettoServer/AssettoServer.csproj
+++ b/AssettoServer/AssettoServer.csproj
@@ -10,7 +10,7 @@
         <DebugType>embedded</DebugType>
         <Nullable>enable</Nullable>
         <PublishDir>..\out-$(RuntimeIdentifier)\</PublishDir>
-        <NoWarn>ERP022,EPC12</NoWarn>
+        <NoWarn>ERP022,EPC12,EPC20</NoWarn>
         <Platforms>AnyCPU</Platforms>
         <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' AND $([MSBuild]::IsOsPlatform('Windows')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64' ">win-x64</RuntimeIdentifier>
         <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' AND $([MSBuild]::IsOsPlatform('Linux')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64' ">linux-x64</RuntimeIdentifier>
@@ -78,6 +78,13 @@
         <PackageReference Include="Sigil" Version="5.0.0" />
         <PackageReference Include="SunCalcNet" Version="1.2.2" />
         <PackageReference Include="System.IO.Hashing" Version="9.0.0-rc.1.24431.7" />
+        <!--
+            Only putting this here because of tons of vulnerability warnings at build time with version 4.3.0.
+            NJsonSchema pulls this in via Namotion.Reflection.
+            
+            TODO Remove once Namotion.Reflection and NJsonSchema no longer depend on a vulnerable version
+         -->
+        <PackageReference Include="System.Private.Uri" Version="4.3.2" />
         <PackageReference Include="YamlDotNet" Version="16.1.2" />
         <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="all" Condition="!Exists('packages.config')" />
     </ItemGroup>
diff --git a/AssettoServer/Network/Tcp/ACTcpClient.cs b/AssettoServer/Network/Tcp/ACTcpClient.cs
index 2bc34786..2332aa04 100644
--- a/AssettoServer/Network/Tcp/ACTcpClient.cs
+++ b/AssettoServer/Network/Tcp/ACTcpClient.cs
@@ -778,7 +778,7 @@ private void OnCarListRequest(PacketReader reader)
             PageIndex = carListRequest.PageIndex,
             EntryCarsCount = carsInPage.Count,
             EntryCars = carsInPage,
-            CarResults = _sessionManager.CurrentSession.Results,
+            CarResults = _sessionManager.CurrentSession.Results ?? new Dictionary<byte, EntryCarResult>(),
         };
 
         CarListResponseSending?.Invoke(this, new CarListResponseSendingEventArgs(carListResponse));