Fix data parse

Author: zeng-github01

CDK/Data/CDKData.cs

@@ -23,10 +23,10 @@ public class CDKData
         public int? MaxRedeem { get; internal set; }
         public DateTime ValidUntil { get; internal set; }
         public bool Renew { get; internal set; }
-        public CSteamID Owner { get; internal set; }
+        public ulong Owner { get; internal set; }
 
         public bool UsePermissionSync { get; internal set; }
-        public CDKData(string cdk,string items, string amount, ushort? vehicle, ushort? exp, decimal? money, int? reputation, string permissonGroup, int redeemedTimes, int? maxredeem, DateTime validuntill, CSteamID steamID, bool renew, bool usePermissionSync)
+        public CDKData(string cdk,string items, string amount, ushort? vehicle, ushort? exp, decimal? money, int? reputation, string permissonGroup, int redeemedTimes, int? maxredeem, DateTime validuntill, ulong steamID, bool renew, bool usePermissionSync)
         {
             CDK = cdk;
             Items = items.Split(',');

CDK/Data/LogData.cs

@@ -10,14 +10,14 @@ namespace CDK.Data
     public class LogData
     {
         public string CDK { get; internal set; }
-        public CSteamID SteamID { get; internal set; }
+        public ulong SteamID { get; internal set; }
         public DateTime RedeemTime { get; internal set; }
         public DateTime ValidUntil { get; internal set; }
         public string GrantPermissionGroup { get; internal set; }
 
         public bool UsePermissionSync { get; internal set; }
 
-        public LogData(string cdk,CSteamID steamID, DateTime redeemtime, DateTime validtime, string PermissionGroup, bool usePermissionSync)
+        public LogData(string cdk,ulong steamID, DateTime redeemtime, DateTime validtime, string PermissionGroup, bool usePermissionSync)
         {
             CDK = cdk;
             SteamID = steamID;

CDK/DatabaseManager.cs

@@ -78,7 +78,7 @@ public RedeemCDKResult RedeemCDK(UnturnedPlayer player, string CDK)
                 var logdata = GetLogData(player.CSteamID, ELogQueryType.ByCDK, CDK);
                 if (cdkdata != null)
                 {
-                    if (cdkdata.Owner != CSteamID.Nil && cdkdata.Owner != player.CSteamID)
+                    if (cdkdata.Owner != 0 && cdkdata.Owner != player.CSteamID.m_SteamID)
                     {
                         return RedeemCDKResult.PlayerNotMatch;
                     }
@@ -184,7 +184,7 @@ public RedeemCDKResult RedeemCDK(UnturnedPlayer player, string CDK)
                             });
                         }
 
-                        SaveLogToDB(new LogData(CDK, player.CSteamID, DateTime.Now, cdkdata.ValidUntil,
+                        SaveLogToDB(new LogData(CDK, player.CSteamID.m_SteamID, DateTime.Now, cdkdata.ValidUntil,
                             cdkdata.GrantPermissionGroup, cdkdata.UsePermissionSync));
                         IncreaseRedeemedTime(CDK);
                         return RedeemCDKResult.Success;
@@ -195,7 +195,7 @@ public RedeemCDKResult RedeemCDK(UnturnedPlayer player, string CDK)
                         if (!cdkdata.UsePermissionSync)
                         {
                             R.Permissions.AddPlayerToGroup(cdkdata.GrantPermissionGroup, player);
-                            UpdateLogInDB(new LogData(CDK, player.CSteamID, DateTime.Now, cdkdata.ValidUntil,
+                            UpdateLogInDB(new LogData(CDK, player.CSteamID.m_SteamID, DateTime.Now, cdkdata.ValidUntil,
                                 cdkdata.GrantPermissionGroup, cdkdata.UsePermissionSync));
                             UpdateRenew(CDK);
                             return RedeemCDKResult.Renewed;
@@ -210,7 +210,7 @@ public RedeemCDKResult RedeemCDK(UnturnedPlayer player, string CDK)
                                         cdkdata.GrantPermissionGroup, cdkdata.ValidUntil, "CDKPlugin");
                                 }
                             });
-                            UpdateLogInDB(new LogData(CDK, player.CSteamID, DateTime.Now, cdkdata.ValidUntil,
+                            UpdateLogInDB(new LogData(CDK, player.CSteamID.m_SteamID, DateTime.Now, cdkdata.ValidUntil,
                                 cdkdata.GrantPermissionGroup, cdkdata.UsePermissionSync));
                             UpdateRenew(CDK);
                             return RedeemCDKResult.Renewed;
@@ -247,18 +247,25 @@ internal void CheckValid(UnturnedPlayer player)
 
         private CDKData BuildCDKData(MySqlDataReader reader)
         {
-            CSteamID owner = reader.IsDBNull(12) ? CSteamID.Nil : new CSteamID(reader.GetUInt64(12));
-
-            return new CDKData(reader.GetString(0), Convert.ToString(reader["Items"]),
-                Convert.ToString(reader["Amount"]), Convert.ToUInt16(reader["Vehicle"]),
-                Convert.ToUInt16(reader["Experience"]), Convert.ToDecimal(reader["Money"]),
-                Convert.ToInt32(reader["Reputation"]), Convert.ToString(reader[7]), reader.GetInt32(9),
+            ulong owner = reader.IsDBNull(12) ? UInt64.MinValue : reader.GetUInt64(12);
+            string items = reader.IsDBNull(1) ? String.Empty : reader.GetString(1);
+            string amount = reader.IsDBNull(2) ? String.Empty : reader.GetString(2);
+            ushort vehicle = reader.IsDBNull(2) ? UInt16.MinValue : reader.GetUInt16(2);
+            ushort exp = reader.IsDBNull(4) ? UInt16.MinValue : reader.GetUInt16(4);
+            decimal money = reader.IsDBNull(6) ? Decimal.Zero : reader.GetDecimal(6);
+            int rep = reader.IsDBNull(7) ? Int32.MinValue : reader.GetInt32(7);
+            string permission = reader.IsDBNull(7) ? String.Empty : reader.GetString(7);
+
+            return new CDKData(reader.GetString(0), items,
+                amount, vehicle,
+                exp, money,
+                rep, permission, reader.GetInt32(9),
                 reader.GetInt32(8), reader.GetDateTime(10), owner, reader.GetBoolean(11), reader.GetBoolean(13));
         }
 
         private LogData BuildLogData(MySqlDataReader reader)
         {
-            return new LogData(reader.GetString(0), new CSteamID(Convert.ToUInt64(reader[1])), reader.GetDateTime(2),
+            return new LogData(reader.GetString(0), reader.GetUInt64(1), reader.GetDateTime(2),
                 reader.GetDateTime(3), Convert.ToString(reader[4]), reader.GetBoolean(5));
         }
 

CDK/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.4")]
-[assembly: AssemblyFileVersion("3.3.0.4")]
+[assembly: AssemblyVersion("3.3.0.5")]
+[assembly: AssemblyFileVersion("3.3.0.5")]