Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Reduce action blocker uses and add target entity to CanInteract (#6655)

Browse Source
This commit is contained in:
Leon Friedrich
2022-02-15 17:06:52 +13:00
committed by GitHub
parent 334568dad2
commit ad9ddf1552
60 changed files with 286 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Buckle/Components/BuckleComponent.cs
View File

@@ -138,12 +138,6 @@ namespace Content.Server.Buckle.Components
return false;
}
if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user))
{
popupSystem.PopupEntity(Loc.GetString("buckle-component-cannot-do-that-message"), user, Filter.Entities(user));
return false;
}
if (!_entMan.TryGetComponent(to, out strap))
{
return false;
@@ -295,13 +289,6 @@ namespace Content.Server.Buckle.Components
return false;
}
if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user))
{
var popupSystem = EntitySystem.Get<SharedPopupSystem>();
popupSystem.PopupEntity(Loc.GetString("buckle-component-cannot-do-that-message"), user, Filter.Entities(user));
return false;
}
if (!user.InRangeUnobstructed(oldBuckledTo.Owner, Range, popup: true))
{
return false;