Merge pull request #8 from NotestQ/master

Fix Culture dependent string conversions
RugbugRedfern · May 17, 2024 · 6db6a9a · 6db6a9a
2 parents 381c671 + 4eca57e
commit 6db6a9a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/MyceliumNetworkingForCW/MyceliumNetwork.cs b/MyceliumNetworkingForCW/MyceliumNetwork.cs
@@ -1,6 +1,7 @@
 using Steamworks;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -372,7 +373,7 @@ public static void SetLobbyData(string key, object value)
 				RugLogger.LogWarning($"Accessing lobby data for unregistered key '{key}'. This might not exist.");
 			}
 
-			if(!SteamMatchmaking.SetLobbyData(Lobby, key, value.ToString()))
+            if (!SteamMatchmaking.SetLobbyData(Lobby, key, (string)Convert.ChangeType(value, typeof(string), CultureInfo.InvariantCulture)))
 			{
 				RugLogger.LogError("Error setting lobby data.");
 			}
@@ -424,7 +425,7 @@ public static T GetLobbyData<T>(string key)
 
 			try
 			{
-				return (T)Convert.ChangeType(value, typeof(T));
+				return (T)Convert.ChangeType(value, typeof(T), CultureInfo.InvariantCulture);
 			}
 			catch(Exception ex)
 			{
@@ -452,7 +453,7 @@ public static void SetPlayerData(string key, object value)
 				RugLogger.LogWarning($"Accessing player data for unregistered key '{key}'. This might not exist.");
 			}
 
-			SteamMatchmaking.SetLobbyMemberData(Lobby, key.ToString(), value.ToString());
+			SteamMatchmaking.SetLobbyMemberData(Lobby, key.ToString(), (string)Convert.ChangeType(value, typeof(string), CultureInfo.InvariantCulture));
 		}
 
 		/// <summary>
@@ -503,7 +504,7 @@ public static T GetPlayerData<T>(CSteamID player, string key)
 			{
 				try
 				{
-					return (T)Convert.ChangeType(value, typeof(T));
+					return (T)Convert.ChangeType(value, typeof(T), CultureInfo.InvariantCulture);
 				}
 				catch(Exception ex)
 				{

diff --git a/MyceliumNetworkingForCW/MyceliumNetworkingForCW.csproj b/MyceliumNetworkingForCW/MyceliumNetworkingForCW.csproj
@@ -91,12 +91,12 @@
 
   <!-- References - Game Assemblies -->
   <ItemGroup Condition="$(CI) != 'true'">
-    <Reference Include="Assembly-CSharp" Publicize="true" Private="false">
-      <HintPath>$(ManagedDirectory)Assembly-CSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="Steamworks.NET" Private="false">
-      <HintPath>$(ManagedDirectory)com.rlabrecque.steamworks.net.dll</HintPath>
-    </Reference>
+	  <Reference Include="Assembly-CSharp" Publicize="true" Private="false">
+		  <HintPath>$(ManagedDirectory)Assembly-CSharp.dll</HintPath>
+	  </Reference>
+	  <Reference Include="Steamworks.NET" Private="false">
+		  <HintPath>$(ManagedDirectory)com.rlabrecque.steamworks.net.dll</HintPath>
+	  </Reference>
   </ItemGroup>
 
   <!-- Package References - Game Assemblies -->