From 432a8f337b36cc6be2579f7db7e9e21ff773b352 Mon Sep 17 00:00:00 2001 From: Chomp Date: Thu, 16 Jan 2025 12:30:56 +0000 Subject: [PATCH 1/2] Fixed nullref error --- Core/Controllers/GameController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Controllers/GameController.cs b/Core/Controllers/GameController.cs index 3731442d..3ea2616b 100644 --- a/Core/Controllers/GameController.cs +++ b/Core/Controllers/GameController.cs @@ -225,7 +225,7 @@ public class GameController var profile = _profileHelper.GetPmcProfile(sessionId); var gameTime = profile?.Stats?.Eft?.OverallCounters?.Items?.FirstOrDefault(c => c.Key.Contains("LifeTime") && - c.Key.Contains("Pmc")).Value ?? 0D; + c.Key.Contains("Pmc"))?.Value ?? 0D; var config = new GameConfigResponse { From 8e18d19e26760c1fec47e04a9a911daecf857997 Mon Sep 17 00:00:00 2001 From: Chomp Date: Thu, 16 Jan 2025 12:31:49 +0000 Subject: [PATCH 2/2] Temp implementation of `TraderEnumHasValue` --- Core/Helpers/TraderHelper.cs | 3 ++- Core/Models/Enums/Traders.cs | 32 +++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/Core/Helpers/TraderHelper.cs b/Core/Helpers/TraderHelper.cs index c3c0bb11..0036621e 100644 --- a/Core/Helpers/TraderHelper.cs +++ b/Core/Helpers/TraderHelper.cs @@ -331,6 +331,7 @@ public class TraderHelper /// True if Traders enum has the param as a value public bool TraderEnumHasValue(string traderId) { - throw new NotImplementedException(); + _logger.Error("HACK TraderEnumHasValue"); + return Traders.TradersDictionary.ContainsValue(traderId); } } diff --git a/Core/Models/Enums/Traders.cs b/Core/Models/Enums/Traders.cs index 7d6204aa..3d66acbd 100644 --- a/Core/Models/Enums/Traders.cs +++ b/Core/Models/Enums/Traders.cs @@ -13,4 +13,34 @@ public static class Traders public const string LIGHTHOUSEKEEPER = "638f541a29ffd1183d187f57"; public const string BTR = "656f0f98d80a697f855d34b1"; public const string REF = "6617beeaa9cfa777ca915b7c"; -} \ No newline at end of file + + public static Dictionary TradersDictionary { get; set; } = new() + { + {TradersEnum.Prapor, "54cb50c76803fa8b248b4571"}, + {TradersEnum.Therapist, "54cb57776803fa99248b456e"}, + {TradersEnum.Fence, "579dc571d53a0658a154fbec"}, + {TradersEnum.Skier, "58330581ace78e27b8b10cee"}, + {TradersEnum.Peacekeeper, "5935c25fb3acc3127c3d8cd9"}, + {TradersEnum.Mechanic, "5a7c2eca46aef81a7ca2145d"}, + {TradersEnum.Ragman, "5ac3b934156ae10c4430e83c"}, + {TradersEnum.Jaeger, "5c0647fdd443bc2504c2d371"}, + {TradersEnum.LighthouseKeeper, "638f541a29ffd1183d187f57"}, + {TradersEnum.Btr, "656f0f98d80a697f855d34b1"}, + {TradersEnum.Ref, "6617beeaa9cfa777ca915b7c"} + }; +} + +public enum TradersEnum +{ + Prapor, + Therapist, + Fence, + Skier, + Peacekeeper, + Mechanic, + Ragman, + Jaeger, + LighthouseKeeper, + Btr, + Ref +}