From 97e73bfd53bb3ae5af43ce76c4103209d40ec683 Mon Sep 17 00:00:00 2001
From: Dawid Bepierszcz <41084667+daffyyyy@users.noreply.github.com>
Date: Mon, 11 Mar 2024 11:16:18 +0100
Subject: [PATCH] 2.2e

---
 Commands.cs | 42 +++++++++++++++++-------------------------
 Events.cs   |  2 +-
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/Commands.cs b/Commands.cs
index 2895a984..ed485b36 100644
--- a/Commands.cs
+++ b/Commands.cs
@@ -33,30 +33,22 @@ namespace WeaponPaints
 
 					if (weaponSync != null)
 					{
-						var weaponTasks = new List<Task>();
-
-						weaponTasks.Add(Task.Run(async () =>
+						if (Config.Additional.SkinEnabled)
 						{
-							await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
-						}));
-
-						if (Config.Additional.GloveEnabled)
-						{
-							weaponTasks.Add(Task.Run(async () =>
-							{
-								await weaponSync.GetGloveFromDatabase(playerInfo);
-							}));
+							_ = Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
 						}
-
 						if (Config.Additional.KnifeEnabled)
 						{
-							weaponTasks.Add(Task.Run(async () =>
-							{
-								await weaponSync.GetKnifeFromDatabase(playerInfo);
-							}));
+							_ = Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
+						}
+						if (Config.Additional.GloveEnabled)
+						{
+							_ = Task.Run(async () => await weaponSync.GetGloveFromDatabase(playerInfo));
+						}
+						if (Config.Additional.AgentEnabled)
+						{
+							_ = Task.Run(async () => await weaponSync.GetAgentFromDatabase(playerInfo));
 						}
-
-						Task.WaitAll(weaponTasks.ToArray());
 
 						RefreshGloves(player);
 						RefreshWeapons(player);
@@ -175,7 +167,7 @@ namespace WeaponPaints
 						RefreshWeapons(player);
 
 					if (weaponSync != null)
-						Task.Run(async () => await weaponSync.SyncKnifeToDatabase(playerInfo, knifeKey));
+						_ = Task.Run(async () => await weaponSync.SyncKnifeToDatabase(playerInfo, knifeKey));
 				}
 			};
 			foreach (var knifePair in knivesOnly)
@@ -288,7 +280,7 @@ namespace WeaponPaints
 
 								try
 								{
-									Task.Run(async () => await weaponSync.SyncWeaponPaintsToDatabase(playerInfo));
+									_ = Task.Run(async () => await weaponSync.SyncWeaponPaintsToDatabase(playerInfo));
 								}
 								catch (Exception ex)
 								{
@@ -409,7 +401,7 @@ namespace WeaponPaints
 
 						if (weaponSync != null)
 						{
-							Task.Run(async () =>
+							_ = Task.Run(async () =>
 							{
 								await weaponSync.SyncGloveToDatabase(playerInfo, weaponDefindex);
 
@@ -422,9 +414,9 @@ namespace WeaponPaints
 								value.Paint = paint;
 								value.Wear = 0.00f;
 								value.Seed = 0;
-							});
 
-							Task.Run(async () => await weaponSync.SyncWeaponPaintsToDatabase(playerInfo));
+								await weaponSync.SyncWeaponPaintsToDatabase(playerInfo);
+							});
 						}
 
 						RefreshGloves(player);
@@ -516,7 +508,7 @@ namespace WeaponPaints
 
 						if (weaponSync != null)
 						{
-							Task.Run(async () =>
+							_ = Task.Run(async () =>
 							{
 								await weaponSync.SyncAgentToDatabase(playerInfo);
 							});
diff --git a/Events.cs b/Events.cs
index a0c68929..8678a2b4 100644
--- a/Events.cs
+++ b/Events.cs
@@ -44,7 +44,7 @@ namespace WeaponPaints
 					_ = Task.Run(async () => await weaponSync.GetAgentFromDatabase(playerInfo));
 				}
 			}
-			catch (AggregateException)
+			catch (Exception)
 			{
 			}