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

Fix UseDelayComponent (#546)

Browse Source 
Currently if this component is present the delay timer is started but it doesn't actually prevent use interactions.

To test this bug, do the following:
1. Set the delay for [bike_horn](https://github.com/space-wizards/space-station-14/blob/master/Resources/Prototypes/Entities/items/bike_horn.yml#L25) to something large like 5.0 that'll make the effect obvious
2. Use the bike horn with the z key. The delay anim will play properly but you'll still be able to spam the honk.
This commit is contained in:
moneyl
2020-01-22 19:37:07 -05:00
committed by Pieter-Jan Briers
parent 86d1f808af
commit 1996893a26
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Linq; using System.Linq;
using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Timing; using Content.Server.GameObjects.Components.Timing;
@@ -564,7 +564,10 @@ namespace Content.Server.GameObjects.EntitySystems
if (used.TryGetComponent<UseDelayComponent>(out var delayComponent)) if (used.TryGetComponent<UseDelayComponent>(out var delayComponent))
{ {
delayComponent.BeginDelay(); if(delayComponent.ActiveDelay)
return;
else
delayComponent.BeginDelay();
} }
var useMsg = new UseInHandMessage(user, used); var useMsg = new UseInHandMessage(user, used);