Merge pull request #9 from Jump-King-Multiplayer/fix/userinfo-crash

Fixed crash that occured when attempting to connect to a non friend player
Jump-King-Modding-Platform · Jan 15, 2022 · a23a16c · a23a16c
2 parents 751d1e0 + 0be9eb6
commit a23a16c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/JKMP.Plugin.Multiplayer/JKMP.Plugin.Multiplayer.csproj b/JKMP.Plugin.Multiplayer/JKMP.Plugin.Multiplayer.csproj
@@ -17,7 +17,7 @@
       <PlatformTarget>x86</PlatformTarget>
     </PropertyGroup>
     <ItemGroup>
-      <PackageReference Include="JKMP.Facepunch.Steamworks.Win32" Version="2.3.4" />
+      <PackageReference Include="JKMP.Facepunch.Steamworks.Win32" Version="2.3.5" />
       <PackageReference Include="JKMP.Core" Version="0.8.3" />
       <PackageReference Include="JKMP.GameDependencies" Version="1.0.0" />
       <PackageReference Include="JKMP.Myra" Version="2.0.1" />

diff --git a/JKMP.Plugin.Multiplayer/Steam/SteamManager.cs b/JKMP.Plugin.Multiplayer/Steam/SteamManager.cs
@@ -15,7 +15,7 @@ public static bool InitializeSteam()
         {
             try
             {
-                SteamClient.Init(1061090, false);
+                SteamClient.Init(1061090, true);
             }
             catch (Exception ex)
             {

diff --git a/JKMP.Plugin.Multiplayer/Steam/SteamUtil.cs b/JKMP.Plugin.Multiplayer/Steam/SteamUtil.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using JKMP.Core.Logging;
 using Steamworks;
 
 namespace JKMP.Plugin.Multiplayer.Steam
@@ -29,15 +30,7 @@ private static void OnPersonaStateChange(Friend friend)
         {
             if (!SteamFriends.RequestUserInformation(steamId))
             {
-                Friend friend = SteamFriends.GetFriends().FirstOrDefault(f => f.Id == steamId);
-
-                if (!friend.Id.IsValid)
-                    friend = SteamFriends.GetFriendsOnGameServer().FirstOrDefault(f => f.Id == steamId);
-
-                if (!friend.Id.IsValid)
-                    return null;
-
-                return friend;
+                return new Friend(steamId);
             }
 
             var tcs = new TaskCompletionSource<Friend>();
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ public static bool InitializeSteam() @@
             {
                 try
                 {
-                    SteamClient.Init(1061090, false);
+                    SteamClient.Init(1061090, true);
                 }
                 catch (Exception ex)
                 {
@@ Expand Down @@