From 15d92c39fecbe5d2fb85294703f8ca8240a1c30b Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 14 Oct 2022 07:35:10 +1300
Subject: [PATCH] Fix slot interactions (again) (#11903)

---
 Content.Client/Inventory/ClientInventorySystem.cs         | 4 ++--
 .../Systems/Inventory/InventoryUIController.cs            | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
index 5e28dba983..317f9c3c2f 100644
--- a/Content.Client/Inventory/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -236,7 +236,7 @@ namespace Content.Client.Inventory
 
         public void UIInventoryStorageActivate(string slot)
         {
-            EntityManager.RaisePredictiveEvent(new OpenSlotStorageNetworkMessage(slot));
+            EntityManager.EntityNetManager?.SendSystemNetworkMessage(new OpenSlotStorageNetworkMessage(slot));
         }
 
         public void UIInventoryExamine(string slot, EntityUid uid)
@@ -260,7 +260,7 @@ namespace Content.Client.Inventory
             if (!TryGetSlotEntity(uid, slot, out var item))
                 return;
 
-            EntityManager.EntityNetManager?.SendSystemNetworkMessage(
+            EntityManager.RaisePredictiveEvent(
                 new InteractInventorySlotEvent(item.Value, altInteract: false));
         }
 
diff --git a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
index 65e690c803..65e7d116f3 100644
--- a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
@@ -1,4 +1,4 @@
-using Content.Client.Gameplay;
+using Content.Client.Gameplay;
 using Content.Client.Hands;
 using Content.Client.Inventory;
 using Content.Client.Storage;
@@ -207,12 +207,6 @@ public sealed class InventoryUIController : UIController, IOnStateEntered<Gamepl
             return;
         }
 
-        if (args.Function == ContentKeyFunctions.ActivateItemInWorld)
-        {
-            _inventorySystem.UIInventoryStorageActivate(control.SlotName);
-            return;
-        }
-
         if (_playerInventory == null)
         {
             return;