Merge pull request #22 from Renerte/develop

Bugfix 1.2.5.1
Renerte · Nov 5, 2017 · 6564efc · 6564efc
2 parents d06874e + 627dbdc
commit 6564efc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/KitZ/Commands.cs b/KitZ/Commands.cs
@@ -42,11 +42,6 @@ public static async void Kit(CommandArgs e)
                 e.Player.SendInfoMessage(string.Format(KitZ.Config.KitGiven, e.Parameters[0]));
                 foreach (var kitItem in kit.ItemList)
                 {
-                    if (!e.Player.InventorySlotAvailable)
-                    {
-                        e.Player.SendErrorMessage(KitZ.Config.NoInventorySpace);
-                        break;
-                    }
                     var item = TShock.Utils.GetItemById(kitItem.Id);
                     if (kitItem.Amount == 0 || kitItem.Amount > item.maxStack)
                         item.stack = item.maxStack;

diff --git a/KitZ/Db/KitManager.cs b/KitZ/Db/KitManager.cs
@@ -69,7 +69,7 @@ public KitManager(IDbConnection db)
                         kits.Find(
                             k => k.Name.Equals(result.Get<string>("Kit"), StringComparison.InvariantCultureIgnoreCase));
                     var uses = result.Get<int>("Uses");
-                    var expireTime = DateTime.Parse(result.Get<string>("ExpireTime"));
+                    var expireTime = DateTime.ParseExact(result.Get<string>("ExpireTime"), "u", null);
                     kitUses.Add(new KitUse(user, kit, uses, expireTime));
                 }
             }
@@ -121,7 +121,7 @@ public async Task<bool> ReloadAsync()
                                             k.Name.Equals(result.Get<string>("Kit"),
                                                 StringComparison.InvariantCultureIgnoreCase));
                                 var uses = result.Get<int>("Uses");
-                                var expireTime = DateTime.Parse(result.Get<string>("ExpireTime"));
+                                var expireTime = DateTime.ParseExact(result.Get<string>("ExpireTime"), "u", null);
                                 kitUses.Add(new KitUse(user, kit, uses, expireTime));
                             }
                         }
@@ -441,16 +441,16 @@ public async Task<bool> AddKitUseAsync(TSPlayer player, Kit kit)
                     lock (slimLock)
                     {
                         kitUses.Add(new KitUse(player.User, kit, 0,
-                            kit.RefreshTime == TimeSpan.Zero
+                            kit.RefreshTime.CompareTo(TimeSpan.Zero) == 0
                                 ? DateTime.MaxValue
                                 : DateTime.UtcNow.Add(kit.RefreshTime)));
                         return db.Query("INSERT INTO KitUses (UserID, Kit, Uses, ExpireTime) VALUES (@0, @1, @2, @3)",
                                    player.User.ID,
                                    kit.Name,
                                    0,
-                                   kit.RefreshTime == TimeSpan.Zero
-                                       ? DateTime.MaxValue.ToString("c")
-                                       : DateTime.UtcNow.Add(kit.RefreshTime).ToString("c")) > 0;
+                                   kit.RefreshTime.CompareTo(TimeSpan.Zero) == 0
+                                       ? DateTime.MaxValue.ToString("u")
+                                       : DateTime.UtcNow.Add(kit.RefreshTime).ToString("u")) > 0;
                     }
                 }
                 catch (Exception ex)

diff --git a/KitZ/Properties/AssemblyInfo.cs b/KitZ/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.2.5.0")]
-[assembly: AssemblyFileVersion("1.2.5.0")]
+[assembly: AssemblyVersion("1.2.5.1")]
+[assembly: AssemblyFileVersion("1.2.5.1")]