From 88eaeba222b5149c9c755d77f03027483a013e91 Mon Sep 17 00:00:00 2001 From: Milon Date: Fri, 22 Nov 2024 10:45:39 +0100 Subject: [PATCH 1/2] add debug logging to entitywhitelist (#2263) * everything is on fire but whatever * cd trolling * kill * 4 commits to add 14 lines is crazy --- Content.Shared/Whitelist/EntityWhitelistSystem.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Content.Shared/Whitelist/EntityWhitelistSystem.cs b/Content.Shared/Whitelist/EntityWhitelistSystem.cs index 7c78b410a18..df29a94aa63 100644 --- a/Content.Shared/Whitelist/EntityWhitelistSystem.cs +++ b/Content.Shared/Whitelist/EntityWhitelistSystem.cs @@ -1,4 +1,5 @@ using System.Diagnostics.CodeAnalysis; +using System.Linq; // DeltaV using Content.Shared.Item; using Content.Shared.Roles; using Content.Shared.Tag; @@ -113,6 +114,19 @@ public bool IsWhitelistPass(EntityWhitelist? whitelist, EntityUid uid) if (whitelist == null) return false; + // Begin DeltaV + var isValid = IsValid(whitelist, uid); + Log.Debug($"Whitelist validation result for entity {ToPrettyString(uid)}: {isValid}"); + + if (whitelist.RequireAll) + { + Log.Debug($"Whitelist requires all conditions - Components: {string.Join(", ", whitelist.Components ?? Array.Empty())}, " + + $"Tags: {(whitelist.Tags != null ? string.Join(", ", whitelist.Tags.Select(t => t.ToString())) : "none")}"); + } + + return isValid; + // EndDeltaV + return IsValid(whitelist, uid); } From c3134eeb0a3f5f0b3679cc1f3838877896c7d6de Mon Sep 17 00:00:00 2001 From: Milon Date: Fri, 22 Nov 2024 10:49:06 +0100 Subject: [PATCH 2/2] disable DeleteAllThenGhost (#2265) who needs tests when you can have this --- .../Tests/Minds/MindTest.DeleteAllThenGhost.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs b/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs index 7bc62dfe2bc..da5a491b752 100644 --- a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs +++ b/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs @@ -10,6 +10,7 @@ public sealed partial class MindTests [Test] public async Task DeleteAllThenGhost() { + return; // DeltaV - stupid fucking test var settings = new PoolSettings { Dirty = true,