From 21382a1e0698c63b41406d40d5c9e40bb652fb6b Mon Sep 17 00:00:00 2001 From: hulkhan22 Date: Sun, 18 May 2025 20:38:13 +0200 Subject: [PATCH] Fix server exception at raid end when client sends bantype data (#257) --- .../SPTarkov.Server.Core/Helpers/ProfileHelper.cs | 2 +- .../SPTarkov.Server.Core/Helpers/TraderHelper.cs | 4 ++-- .../Models/Eft/Common/Tables/BotBase.cs | 14 +++++++------- Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Helpers/ProfileHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ProfileHelper.cs index 93deacbd..a377e22c 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/ProfileHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/ProfileHelper.cs @@ -608,7 +608,7 @@ public class ProfileHelper( public bool PlayerIsFleaBanned(PmcData pmcProfile) { var currentTimestamp = _timeUtil.GetTimeStamp(); - return pmcProfile?.Info?.Bans?.Any(b => b.BanType == BanType.RAGFAIR && currentTimestamp < b.DateTime) ?? false; + return pmcProfile?.Info?.Bans?.Any(b => b.BanType == BanType.RagFair && currentTimestamp < b.DateTime) ?? false; } public bool HasAccessToRepeatableFreeRefreshSystem(PmcData pmcProfile) diff --git a/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs index 561d1dd8..a15a63cc 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs @@ -183,7 +183,7 @@ public class TraderHelper( if ((rawProfileTemplate.FleaBlockedDays ?? 0) > 0) { var newBanDateTime = _timeUtil.GetTimeStampFromNowDays(rawProfileTemplate.FleaBlockedDays ?? 0); - var existingBan = pmcData.Info.Bans.FirstOrDefault(ban => ban.BanType == BanType.RAGFAIR); + var existingBan = pmcData.Info.Bans.FirstOrDefault(ban => ban.BanType == BanType.RagFair); if (existingBan is not null) { existingBan.DateTime = newBanDateTime; @@ -193,7 +193,7 @@ public class TraderHelper( pmcData.Info.Bans.Add( new Ban { - BanType = BanType.RAGFAIR, + BanType = BanType.RagFair, DateTime = newBanDateTime } ); diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs index 01bf0e77..0b68d734 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs @@ -618,13 +618,13 @@ public record Ban public enum BanType { - CHAT = 0, - RAGFAIR = 1, - VOIP = 2, - TRADING = 3, - ONLINE = 4, - FRIENDS = 5, - CHANGE_NICKNAME = 6 + Chat, + RagFair, + Voip, + Trading, + Online, + Friends, + ChangeNickname, } public record Customization diff --git a/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs index b9c3a435..940c1e00 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs @@ -55,7 +55,7 @@ public class JsonUtil new EftEnumConverter(), new EftEnumConverter(), new EftEnumConverter(), - + new EftEnumConverter(), new EftEnumConverter(), new EftEnumConverter(), new EftEnumConverter(),