Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

6
Content.Server/Plants/Systems/PottedPlantHideSystem.cs
View File

@@ -37,9 +37,6 @@ namespace Content.Server.Plants.Systems
if (args.Handled)
return;
// standard interaction checks
if (!_blocker.CanInteract(args.User)) return;
Rustle(uid, component);
args.Handled = _stashSystem.TryHideItem(uid, args.User, args.Used);
}
@@ -49,9 +46,6 @@ namespace Content.Server.Plants.Systems
if (args.Handled)
return;
// standard interaction checks
if (!_blocker.CanInteract(args.User)) return;
Rustle(uid, component);
var gotItem = _stashSystem.TryGetItem(uid, args.User);