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

7
Content.Server/Light/EntitySystems/LightReplacerSystem.cs
View File

@@ -16,9 +16,8 @@ using Robust.Shared.Player;
namespace Content.Server.Light.EntitySystems
{
[UsedImplicitly]
public class LightReplacerSystem : EntitySystem
public sealed class LightReplacerSystem : EntitySystem
{
[Dependency] private readonly ActionBlockerSystem _blocker = default!;
[Dependency] private readonly PoweredLightSystem _poweredLight = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
@@ -42,7 +41,6 @@ namespace Content.Server.Light.EntitySystems
return;
// standard interaction checks
if (!_blocker.CanUse(eventArgs.User)) return;
if (!eventArgs.CanReach) return;
// behaviour will depends on target type
@@ -64,9 +62,6 @@ namespace Content.Server.Light.EntitySystems
if (eventArgs.Handled)
return;
// standard interaction checks
if (!_blocker.CanInteract(eventArgs.User)) return;
var usedUid = eventArgs.Used;
// want to insert a new light bulb?