diff --git a/DatabaseManager.cs b/DatabaseManager.cs index a6bab68..36c8dd9 100644 --- a/DatabaseManager.cs +++ b/DatabaseManager.cs @@ -1,12 +1,13 @@ using Google.Protobuf; using MySql.Data.MySqlClient; +using Newtonsoft.Json; using Rocket.Core.Logging; +using SDG.Framework.IO.Deserialization; using SDG.Unturned; using Steamworks; using System; using System.Collections.Generic; using System.Linq; -using System.Text.Json; namespace PlayerInfoLibrary { @@ -609,7 +610,7 @@ private string ParseOption(OptionType optionType) private PlayerData BuildPlayerData(MySqlDataReader reader) { - return new PlayerData((CSteamID)reader.GetUInt64("SteamID"), reader.GetString("SteamName"), reader.GetString("CharName"), Parser.getIPFromUInt32(reader.GetUInt32("IP")), JsonSerializer.Deserialize>(reader.GetString("HWID")), reader.GetInt64("LastLoginGlobal").FromTimeStamp(), reader.GetUInt16("LastServerID"), !reader.IsDBNull("LastServerName") ? reader.GetString("LastServerName") : string.Empty, !reader.IsDBNull("ServerID") ? reader.GetUInt16("ServerID") : (ushort)0, !reader.IsDBNull("LastLoginLocal") ? reader.GetInt64("LastLoginLocal").FromTimeStamp() : (0L).FromTimeStamp(), !reader.IsDBNull("CleanedBuildables") ? reader.GetBoolean("CleanedBuildables") : false, !reader.IsDBNull("CleanedPlayerData") ? reader.GetBoolean("CleanedPlayerData") : false, reader.GetInt32("TotalPlayTime")); + return new PlayerData((CSteamID)reader.GetUInt64("SteamID"), reader.GetString("SteamName"), reader.GetString("CharName"), Parser.getIPFromUInt32(reader.GetUInt32("IP")), JsonConvert.DeserializeObject>(reader.GetString("HWID")), reader.GetInt64("LastLoginGlobal").FromTimeStamp(), reader.GetUInt16("LastServerID"), !reader.IsDBNull("LastServerName") ? reader.GetString("LastServerName") : string.Empty, !reader.IsDBNull("ServerID") ? reader.GetUInt16("ServerID") : (ushort)0, !reader.IsDBNull("LastLoginLocal") ? reader.GetInt64("LastLoginLocal").FromTimeStamp() : (0L).FromTimeStamp(), !reader.IsDBNull("CleanedBuildables") ? reader.GetBoolean("CleanedBuildables") : false, !reader.IsDBNull("CleanedPlayerData") ? reader.GetBoolean("CleanedPlayerData") : false, reader.GetInt32("TotalPlayTime")); } // Cleanup section. @@ -787,7 +788,7 @@ internal void SaveToDB(PlayerData pdata, bool retry = false) command.Parameters.AddWithValue("@steamname", pdata.SteamName.Truncate(200)); command.Parameters.AddWithValue("@charname", pdata.CharacterName.Truncate(200)); command.Parameters.AddWithValue("@ip", Parser.getUInt32FromIP(pdata.IP)); - command.Parameters.AddWithValue("@hwid", JsonSerializer.Serialize(pdata.HWID)); + command.Parameters.AddWithValue("@hwid", JsonConvert.SerializeObject(pdata.HWID)); command.Parameters.AddWithValue("@instanceid", pdata.ServerID); command.Parameters.AddWithValue("@lastinstanceid", pdata.LastServerID); command.Parameters.AddWithValue("@lastloginglobal", pdata.LastLoginGlobal.ToTimeStamp()); diff --git a/PlayerInfoLib.csproj b/PlayerInfoLib.csproj index 6ca10b3..334c050 100644 --- a/PlayerInfoLib.csproj +++ b/PlayerInfoLib.csproj @@ -67,6 +67,10 @@ packages\MySql.Data.8.0.28\lib\net48\MySql.Data.dll + + False + D:\Program Files (x86)\Steam\steamapps\common\U3DS\Unturned_Data\Managed\Newtonsoft.Json.dll + lib\Rocket.API.dll False @@ -97,7 +101,6 @@ packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll - diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 6cf1b56..3af6b3c 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.2.0")] -[assembly: AssemblyFileVersion("1.4.2.0")] +[assembly: AssemblyVersion("1.6.0.0")] +[assembly: AssemblyFileVersion("1.6.0.0")]