cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove blacklist methods from fork changes

This commit is contained in:
BarryNorfolk 2026-01-01 16:08:39 +01:00
parent 23c832b185
commit b1ebff0742
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/_DV/CosmicCult/CosmicCultObjectiveSystem.cs
View File

@ -42,7 +42,7 @@ public sealed class CosmicCultObjectiveSystem : EntitySystem
// TODO: Add a blacklist comp to this like ninja now has from upstream #40726
while (query.MoveNext(out var warpUid, out var warp))
{
if (_whitelist.IsBlacklistFail(effigyBlacklist, warpUid)
if (_whitelist.IsWhitelistFail(effigyBlacklist, warpUid)
&& !string.IsNullOrWhiteSpace(warp?.Location))
{
warps.Add(warpUid);

2
Content.Server/_DV/Weather/WeatherEffectsSystem.cs
View File

@ -75,7 +75,7 @@ public sealed partial class WeatherEffectsSystem : EntitySystem
continue;
}
if (_whitelist.IsBlacklistFailOrNull(weather.DamageBlacklist, uid))
if (_whitelist.IsWhitelistFailOrNull(weather.DamageBlacklist, uid))
_damageable.TryChangeDamage(uid, damage, interruptsDoAfters: false);
}
}

2
Content.Server/_Goobstation/Devil/Grip/DevilGripSystem.cs
View File

@ -44,7 +44,7 @@ public sealed class DevilGripSystem : EntitySystem
if (!args.CanReach
|| args.Target is not { } target
|| args.Target == args.User
|| _whitelist.IsBlacklistPass(ent.Comp.Blacklist, target)
|| _whitelist.IsWhitelistPass(ent.Comp.Blacklist, target)
|| !TryComp<DevilComponent>(args.User, out var devilComp))
return;

2
Content.Shared/Emag/Systems/EmagSystem.cs
View File

@ -64,7 +64,7 @@ public sealed class EmagSystem : EntitySystem
return false;
// Begin DeltaV Additions
if (_whitelist.IsBlacklistPass(ent.Comp.Blacklist, target))
if (_whitelist.IsWhitelistPass(ent.Comp.Blacklist, target))
return false;
// End DeltaV Additions

2
Content.Shared/ItemRecall/SharedItemRecallSystem.cs
View File

@ -109,7 +109,7 @@ public abstract partial class SharedItemRecallSystem : EntitySystem
if (action.Comp.AttachedEntity is not {} user)
return false;
if (_whitelistSystem.IsBlacklistPass(ent.Comp.MarkedEntityBlacklist, item))
if (_whitelistSystem.IsWhitelistPass(ent.Comp.MarkedEntityBlacklist, item))
{
_popups.PopupClient(Loc.GetString("item-recall-item-steal-target", ("item", item)), user, user);
return false;

6
Content.Shared/_DV/Armor/Systems/HandHeldArmorSystem.cs
View File

@ -38,7 +38,7 @@ public sealed class HandHeldArmorSystem : EntitySystem
{
if (!armor.Comp.Holder.HasValue
|| _whitelist.IsWhitelistFail(armor.Comp.Whitelist, armor.Comp.Holder.Value) // If they pass the lists, add the coefficients.
|| _whitelist.IsBlacklistPass(armor.Comp.Blacklist, armor.Comp.Holder.Value))
|| _whitelist.IsWhitelistPass(armor.Comp.Blacklist, armor.Comp.Holder.Value))
return;
foreach (var armorCoefficient in armor.Comp.Modifiers.Coefficients)
@ -54,7 +54,7 @@ public sealed class HandHeldArmorSystem : EntitySystem
{
if (!armor.Comp.Holder.HasValue
|| _whitelist.IsWhitelistFail(armor.Comp.Whitelist, armor.Comp.Holder.Value) // If they pass the lists, add the coefficients.
|| _whitelist.IsBlacklistPass(armor.Comp.Blacklist, armor.Comp.Holder.Value))
|| _whitelist.IsWhitelistPass(armor.Comp.Blacklist, armor.Comp.Holder.Value))
return;
args.Args.Damage = DamageSpecifier.ApplyModifierSet(args.Args.Damage, armor.Comp.Modifiers);
@ -71,7 +71,7 @@ public sealed class HandHeldArmorSystem : EntitySystem
// If the user is blacklisted or not whitelisted, show what they need. Otherwise, show resistance values.
if (_whitelist.IsWhitelistPassOrNull(armor.Comp.Whitelist, args.User)
&& _whitelist.IsBlacklistFailOrNull(armor.Comp.Blacklist, args.User))
&& _whitelist.IsWhitelistFailOrNull(armor.Comp.Blacklist, args.User))
{
examineMarkup = GetHeldArmorExamine(armor);

2
Content.Shared/_DV/Construction/UpgradeKitSystem.cs
View File

@ -78,7 +78,7 @@ public sealed class UpgradeKitSystem : EntitySystem
public bool CanUpgrade(Entity<UpgradeKitComponent> ent, EntityUid target, EntityUid user)
{
if (_whitelist.IsWhitelistFail(ent.Comp.Whitelist, target) ||
_whitelist.IsBlacklistPass(ent.Comp.Blacklist, target))
_whitelist.IsWhitelistPass(ent.Comp.Blacklist, target))
{
_popup.PopupClient(Loc.GetString("upgrade-kit-invalid-target"), target, user);
return false;

2
Content.Shared/_DV/Kitchen/Systems/SharedDeepFryerSystem.cs
View File

@ -169,7 +169,7 @@ public abstract class SharedDeepFryerSystem : EntitySystem
return false;
// Check blacklist first since it should override
if (_whitelist.IsBlacklistPass(ent.Comp.Blacklist, item))
if (_whitelist.IsWhitelistPass(ent.Comp.Blacklist, item))
{
reason = Loc.GetString("deep-fryer-blacklist-item");
return false;

2
Content.Shared/_DV/Recruiter/SharedRecruiterPenSystem.cs
View File

@ -117,7 +117,7 @@ public abstract class SharedRecruiterPenSystem : EntitySystem
private bool CheckBlacklist(Entity<RecruiterPenComponent> ent, EntityUid user, string action)
{
var (uid, comp) = ent;
if (_whitelist.IsBlacklistPass(comp.Blacklist, user) || _faction.IsMemberOfAny(user, ent.Comp.FactionBlacklist))
if (_whitelist.IsWhitelistPass(comp.Blacklist, user) || _faction.IsMemberOfAny(user, ent.Comp.FactionBlacklist))
{
Popup.PopupPredicted(Loc.GetString($"recruiter-pen-{action}-forbidden", ("pen", uid)), user, user);
return true;