From: Tayrtahn <tayrtahn@gmail.com>
Date: Fri, 12 Apr 2024 06:30:34 +0000 (-0400)
Subject: Fix potted plant popup/sfx spam (#26901)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=8e9d2744f3d196fc11e88a4755f98cac8ad8dbee;p=space-station-14.git

Fix potted plant popup/sfx spam (#26901)

Fixed potted plant hide popup/sfx spam.
---

diff --git a/Content.Shared/Plants/PottedPlantHideSystem.cs b/Content.Shared/Plants/PottedPlantHideSystem.cs
index fd256fd926..cbe052f8d5 100644
--- a/Content.Shared/Plants/PottedPlantHideSystem.cs
+++ b/Content.Shared/Plants/PottedPlantHideSystem.cs
@@ -31,7 +31,7 @@ namespace Content.Shared.Plants
             if (args.Handled)
                 return;
 
-            Rustle(uid, component);
+            Rustle(uid, component, args.User);
             args.Handled = _stashSystem.TryHideItem(uid, args.User, args.Used);
         }
 
@@ -40,24 +40,24 @@ namespace Content.Shared.Plants
             if (args.Handled)
                 return;
 
-            Rustle(uid, component);
+            Rustle(uid, component, args.User);
 
             var gotItem = _stashSystem.TryGetItem(uid, args.User);
             if (!gotItem)
             {
                 var msg = Loc.GetString("potted-plant-hide-component-interact-hand-got-no-item-message");
-                _popupSystem.PopupEntity(msg, uid, args.User);
+                _popupSystem.PopupClient(msg, uid, args.User);
             }
 
             args.Handled = gotItem;
         }
 
-        private void Rustle(EntityUid uid, PottedPlantHideComponent? component = null)
+        private void Rustle(EntityUid uid, PottedPlantHideComponent? component = null, EntityUid? user = null)
         {
             if (!Resolve(uid, ref component))
                 return;
 
-            _audio.PlayPvs(component.RustleSound, uid, AudioParams.Default.WithVariation(0.25f));
+            _audio.PlayPredicted(component.RustleSound, uid, user, AudioParams.Default.WithVariation(0.25f));
         }
     }
 }