tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Activate now triggers UseDelay cooldown as well.

Browse Source 
Fixes #4605
This commit is contained in:
Vera Aguilera Puerto
2021-10-02 11:02:02 +02:00
parent 665928cfcf
commit 1aadd3e57d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Interaction/InteractionSystem.cs
View File

@@ -207,6 +207,14 @@ namespace Content.Server.Interaction
private void InteractionActivate(IEntity user, IEntity used) private void InteractionActivate(IEntity user, IEntity used)
{ {
if (used.TryGetComponent<UseDelayComponent>(out var delayComponent))
{
if (delayComponent.ActiveDelay)
return;
delayComponent.BeginDelay();
}
if (!_actionBlockerSystem.CanInteract(user) || ! _actionBlockerSystem.CanUse(user)) if (!_actionBlockerSystem.CanInteract(user) || ! _actionBlockerSystem.CanUse(user))
return; return;
@@ -595,7 +603,7 @@ namespace Content.Server.Interaction
{ {
if (delayComponent.ActiveDelay) if (delayComponent.ActiveDelay)
return; return;
else
delayComponent.BeginDelay(); delayComponent.BeginDelay();
} }