From 27ac4d76f52f8bbade6e386a6891977f4c059e40 Mon Sep 17 00:00:00 2001 From: Popax21 Date: Wed, 24 Jul 2024 02:52:59 +0200 Subject: [PATCH] Fix ContainsKey / ContainsValue confusion --- CelesteNet.Server.FrontendModule/WSCMDs/WSCMDsExtra.cs | 2 +- CelesteNet.Server/ConPlus/ExtendedHandshake.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CelesteNet.Server.FrontendModule/WSCMDs/WSCMDsExtra.cs b/CelesteNet.Server.FrontendModule/WSCMDs/WSCMDsExtra.cs index 698fd341..6ebc893a 100644 --- a/CelesteNet.Server.FrontendModule/WSCMDs/WSCMDsExtra.cs +++ b/CelesteNet.Server.FrontendModule/WSCMDs/WSCMDsExtra.cs @@ -60,7 +60,7 @@ public class WSCMDBanExt : WSCMD { if (plusCon == null) continue; - if (!(plusCon.GetAssociatedData() is ExtendedHandshake.ConnectionData plConData && plConData.CheckEntries.ContainsKey(checkValueVal))) + if (!(plusCon.GetAssociatedData() is ExtendedHandshake.ConnectionData plConData && plConData.CheckEntries.ContainsValue(checkValueVal))) continue; if (ban.Name.IsNullOrEmpty()) diff --git a/CelesteNet.Server/ConPlus/ExtendedHandshake.cs b/CelesteNet.Server/ConPlus/ExtendedHandshake.cs index f20f878e..7dd75150 100644 --- a/CelesteNet.Server/ConPlus/ExtendedHandshake.cs +++ b/CelesteNet.Server/ConPlus/ExtendedHandshake.cs @@ -10,11 +10,11 @@ public class ExtendedHandshake : IConnectionFeature { public record ConnectionData(string CheckEnv = "", string CheckMAC = "", string CheckDevice = "", string SelfReportBan = "") { - public IDictionary CheckEntries => new Dictionary() { + public Dictionary CheckEntries => new Dictionary() { ["CheckEnv"] = CheckEnv, ["CheckMAC"] = CheckMAC, ["CheckDevice"] = CheckDevice, - }.AsReadOnly(); + }; public bool CheckEntriesValid => CheckEntries.All(e => !e.Value.IsNullOrEmpty());