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

Fix "You can't reach there!" message being created twice

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-08 16:00:04 +02:00
parent fb51aecfbf
commit 4ec733577f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs
View File

@@ -137,14 +137,17 @@ namespace Content.Server.GameObjects.Components.Mobs
var strapPosition = strap.Owner.Transform.MapPosition; var strapPosition = strap.Owner.Transform.MapPosition;
if (!InteractionChecks.InRangeUnobstructed(user, strapPosition, _range) || if (!InteractionChecks.InRangeUnobstructed(user, strapPosition, _range))
ContainerHelpers.IsInContainer(Owner))
{ {
_notifyManager.PopupMessage(user, user,
Loc.GetString("You can't reach there!"));
return false; return false;
} }
if (ContainerHelpers.IsInContainer(Owner))
{
_notifyManager.PopupMessage(strap.Owner, user,
Loc.GetString("You can't reach there!"));
}
if (!user.HasComponent<HandsComponent>()) if (!user.HasComponent<HandsComponent>())
{ {
_notifyManager.PopupMessage(user, user, _notifyManager.PopupMessage(user, user,