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

Fix some pop-up spam (#7070)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-12 12:53:42 +13:00
committed by GitHub
parent 108c7cfdf6
commit 3096ba3040
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -25,6 +25,7 @@ using Content.Shared.Wall;
using Content.Shared.Item; using Content.Shared.Item;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Input; using Robust.Shared.Input;
using Robust.Shared.Timing;
#pragma warning disable 618 #pragma warning disable 618
@@ -37,6 +38,7 @@ namespace Content.Shared.Interaction
public abstract class SharedInteractionSystem : EntitySystem public abstract class SharedInteractionSystem : EntitySystem
{ {
[Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly SharedPhysicsSystem _sharedBroadphaseSystem = default!; [Dependency] private readonly SharedPhysicsSystem _sharedBroadphaseSystem = default!;
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
[Dependency] private readonly SharedVerbSystem _verbSystem = default!; [Dependency] private readonly SharedVerbSystem _verbSystem = default!;
@@ -455,7 +457,7 @@ namespace Content.Shared.Interaction
var inRange = InRangeUnobstructed(origin, mapPos, range, collisionMask, combinedPredicate, popup); var inRange = InRangeUnobstructed(origin, mapPos, range, collisionMask, combinedPredicate, popup);
if (!inRange && popup) if (!inRange && popup && _gameTiming.IsFirstTimePredicted)
{ {
var message = Loc.GetString("interaction-system-user-interaction-cannot-reach"); var message = Loc.GetString("interaction-system-user-interaction-cannot-reach");
_popupSystem.PopupEntity(message, origin, Filter.Entities(origin)); _popupSystem.PopupEntity(message, origin, Filter.Entities(origin));
@@ -596,7 +598,7 @@ namespace Content.Shared.Interaction
var originPosition = Transform(origin).MapPosition; var originPosition = Transform(origin).MapPosition;
var inRange = InRangeUnobstructed(originPosition, other, range, collisionMask, combinedPredicatre); var inRange = InRangeUnobstructed(originPosition, other, range, collisionMask, combinedPredicatre);
if (!inRange && popup) if (!inRange && popup && _gameTiming.IsFirstTimePredicted)
{ {
var message = Loc.GetString("interaction-system-user-interaction-cannot-reach"); var message = Loc.GetString("interaction-system-user-interaction-cannot-reach");
_popupSystem.PopupEntity(message, origin, Filter.Entities(origin)); _popupSystem.PopupEntity(message, origin, Filter.Entities(origin));
@@ -727,7 +729,7 @@ namespace Content.Shared.Interaction
if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, used)) if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, used))
return false; return false;
if (checkAccess && !InRangeUnobstructed(user, used, popup: true)) if (checkAccess && !InRangeUnobstructed(user, used))
return false; return false;
// Check if interacted entity is in the same container, the direct child, or direct parent of the user. // Check if interacted entity is in the same container, the direct child, or direct parent of the user.