Merge pull request #1 from schlosrat/master

Fixed issue that was causing NREs

Author: Falki-git

SkipSplashScreenProject/SkipSplashScreen.csproj

@@ -10,11 +10,20 @@
         <Description>Skips the splashscreen</Description>
         <Version>1.0.0</Version>
         <RestoreAdditionalProjectSources>
+            https://api.nuget.org/v3/index.json;
+            https://nuget.bepinex.dev/v3/index.json;
             https://nuget.spacewarp.org/v3/index.json
         </RestoreAdditionalProjectSources>
         <RootNamespace>SkipSplashScreen</RootNamespace>
         <ModId Condition="'$(ModId)'==''">skip_splash_screen</ModId>
     </PropertyGroup>
+    <ItemGroup>
+        <Reference Include="Assembly-CSharp">
+            <HintPath>..\external_dlls\Assembly-CSharp.dll</HintPath>
+            <Publicize>true</Publicize>
+            <Private>false</Private>
+        </Reference>
+    </ItemGroup>
     <ItemGroup>
         <PackageReference Include="BepInEx.Analyzers" Version="1.*" PrivateAssets="all" />
         <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.0" PrivateAssets="all" />
@@ -24,12 +33,7 @@
         <PackageReference Include="SpaceWarp" Version="1.1.1" />
         <PackageReference Include="UnityEngine.Modules" Version="2020.3.33" IncludeAssets="compile" />
     </ItemGroup>
-    <ItemGroup>
-      <Reference Include="Assembly-CSharp">
-        <HintPath>..\external_dlls\Assembly-CSharp.dll</HintPath>
-      </Reference>
-    </ItemGroup>
     <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-        <Exec Command="echo d | xcopy /y /s &quot;$(ProjectDir)..\$(ModId)\&quot; &quot;$(ProjectDir)..\$(ConfigurationName)\BepInEx\plugins\$(ModId)\&quot;&#xA;echo f | xcopy /y &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\$(ConfigurationName)\BepInEx\plugins\$(ModId)\$(ModId).dll&quot;&#xA;if $(ConfigurationName) == Debug echo f | xcopy /y &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(ProjectDir)..\$(ConfigurationName)\BepInEx\plugins\$(ModId)\$(ModId).pdb&quot;&#xA;xcopy /y &quot;$(ProjectDir)..\LICENSE&quot; &quot;$(ProjectDir)..\$(ConfigurationName)\BepInEx\plugins\$(ModId)\&quot;&#xA;echo f | xcopy /y &quot;$(ProjectDir)..\README.md&quot; &quot;$(ProjectDir)..\$(ConfigurationName)\BepInEx\plugins\$(ModId)\README.txt&quot;&#xD;&#xA;&#xD;&#xA;echo Copying output .dll to &quot;..Kerbal Space Program 2 0.1.2.0 DEV\BepInEx\plugins\SkipSplashScreen\&quot;&#xD;&#xA;xcopy /y &quot;$(ProjectDir)..\$(ConfigurationName)\BepInEx\plugins\$(ModId)\$(ModId).dll&quot; &quot;D:\Steam\steamapps\common\Kerbal Space Program 2 0.1.2.0 DEV\BepInEx\plugins\SkipSplashScreen\&quot;&#xD;&#xA;&#xD;&#xA;echo Copying output .pdb to &quot;..Kerbal Space Program 2 0.1.2.0 DEV\BepInEx\plugins\SkipSplashScreen\&quot;&#xD;&#xA;xcopy /y &quot;$(ProjectDir)..\$(ConfigurationName)\BepInEx\plugins\$(ModId)\$(ModId).pdb&quot; &quot;D:\Steam\steamapps\common\Kerbal Space Program 2 0.1.2.0 DEV\BepInEx\plugins\SkipSplashScreen\&quot;&#xD;&#xA;&#xD;&#xA;echo Starting KSP2_x64.exe&#xD;&#xA;powershell &quot;start-process &quot;&quot;D:\Steam\steamapps\common\Kerbal Space Program 2 0.1.2.0 DEV\KSP2_x64.exe&quot;&quot;&quot;" />
+        <Exec Command="echo d | xcopy /y /s &quot;$(ProjectDir)..\$(ModId)\&quot; &quot;$(ProjectDir)..\$(ConfigurationName)\BepInEx\plugins\$(ModId)\&quot;&#xA;echo f | xcopy /y &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\$(ConfigurationName)\BepInEx\plugins\$(ModId)\$(ModId).dll&quot;&#xA;if $(ConfigurationName) == Debug echo f | xcopy /y &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(ProjectDir)..\$(ConfigurationName)\BepInEx\plugins\$(ModId)\$(ModId).pdb&quot;&#xA;xcopy /y &quot;$(ProjectDir)..\LICENSE&quot; &quot;$(ProjectDir)..\$(ConfigurationName)\BepInEx\plugins\$(ModId)\&quot;&#xA;echo f | xcopy /y &quot;$(ProjectDir)..\README.md&quot; &quot;$(ProjectDir)..\$(ConfigurationName)\BepInEx\plugins\$(ModId)\README.txt&quot;" />
     </Target>
 </Project>

SkipSplashScreenProject/SkipSplashScreenPlugin.cs

@@ -23,12 +23,12 @@ public void Start()
 
     public void Update()
     {
-        var gameState = GameManager.Instance?.Game.GlobalGameState?.GetState();
+        var gameState = GameManager.Instance?.Game?.GlobalGameState?.GetState();
 
         if (gameState == null)
             return;
 
-        if (GameManager.Instance.Game.GlobalGameState.GetState() == GameState.MainMenu)
+        if (GameManager.Instance?.Game?.GlobalGameState?.GetState() == GameState.MainMenu)
             Destroy(this);
     }