From 4ec733577f21aaa2ea5b1dee5d86332a33a6f1f0 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Wed, 8 Jul 2020 16:00:04 +0200
Subject: [PATCH] Fix "You can't reach there!" message being created twice

---
 .../GameObjects/Components/Mobs/BuckleComponent.cs    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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