Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…ontiers-14#2478)

This reverts commit 49c159d.
  • Loading branch information
dvir001 authored Nov 29, 2024
1 parent 8b6c666 commit eedc991
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions Content.Shared/Whitelist/EntityWhitelistSystem.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq; // DeltaV
using Content.Shared.Item;
using Content.Shared.Roles;
using Content.Shared.Tag;
Expand Down Expand Up @@ -281,20 +280,7 @@ 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<string>())}, " +
$"Tags: {(whitelist.Tags != null ? string.Join(", ", whitelist.Tags.Select(t => t.ToString())) : "none")}");
}

return isValid;
// EndDeltaV

//return IsValid(whitelist, uid); // DeltaV
return IsValid(whitelist, uid);
}

/// <summary>
Expand Down

0 comments on commit eedc991

Please sign in to comment.