Prevent pseudoitems from being transferred between bags (#553)

* Update PseudoItemSystem.cs * Rider full cleanup * Also abort in sharedstorage * Make the comp shared * Why drop the bags?
DeltaV-Station · Dec 29, 2023 · 985b2f9 · 985b2f9
1 parent 2246b2e
commit 985b2f9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 13 deletions.
diff --git a/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs b/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs
@@ -1,18 +1,18 @@
-using System.Threading;
-using Content.Shared.Verbs;
-using Content.Shared.Item;
-using Content.Shared.Hands;
+using Content.Server.DoAfter;
+using Content.Server.Storage.EntitySystems;
 using Content.Shared.DoAfter;
+using Content.Shared.Hands;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Item;
 using Content.Shared.Item.PseudoItem;
 using Content.Shared.Storage;
-using Content.Server.Storage.EntitySystems;
-using Content.Server.DoAfter;
 using Content.Shared.Tag;
+using Content.Shared.Verbs;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Item.PseudoItem;
-public sealed partial class PseudoItemSystem : EntitySystem
+
+public sealed class PseudoItemSystem : EntitySystem
 {
     [Dependency] private readonly StorageSystem _storageSystem = default!;
     [Dependency] private readonly ItemSystem _itemSystem = default!;
@@ -31,6 +31,7 @@ public override void Initialize()
         SubscribeLocalEvent<PseudoItemComponent, GettingPickedUpAttemptEvent>(OnGettingPickedUpAttempt);
         SubscribeLocalEvent<PseudoItemComponent, DropAttemptEvent>(OnDropAttempt);
         SubscribeLocalEvent<PseudoItemComponent, PseudoItemInsertDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<PseudoItemComponent, ContainerGettingInsertedAttemptEvent>(OnInsertAttempt);
     }
 
     private void AddInsertVerb(EntityUid uid, PseudoItemComponent component, GetVerbsEvent<InnateVerb> args)
@@ -97,7 +98,8 @@ private void OnEntRemoved(EntityUid uid, PseudoItemComponent component, EntGotRe
         component.Active = false;
     }
 
-    private void OnGettingPickedUpAttempt(EntityUid uid, PseudoItemComponent component, GettingPickedUpAttemptEvent args)
+    private void OnGettingPickedUpAttempt(EntityUid uid, PseudoItemComponent component,
+        GettingPickedUpAttemptEvent args)
     {
         if (args.User == args.Item)
             return;
@@ -111,6 +113,7 @@ private void OnDropAttempt(EntityUid uid, PseudoItemComponent component, DropAtt
         if (component.Active)
             args.Cancel();
     }
+
     private void OnDoAfter(EntityUid uid, PseudoItemComponent component, DoAfterEvent args)
     {
         if (args.Handled || args.Cancelled || args.Args.Used == null)
@@ -119,7 +122,8 @@ private void OnDoAfter(EntityUid uid, PseudoItemComponent component, DoAfterEven
         args.Handled = TryInsert(args.Args.Used.Value, uid, component);
     }
 
-    public bool TryInsert(EntityUid storageUid, EntityUid toInsert, PseudoItemComponent component, StorageComponent? storage = null)
+    public bool TryInsert(EntityUid storageUid, EntityUid toInsert, PseudoItemComponent component,
+        StorageComponent? storage = null)
     {
         if (!Resolve(storageUid, ref storage))
             return false;
@@ -139,16 +143,17 @@ public bool TryInsert(EntityUid storageUid, EntityUid toInsert, PseudoItemCompon
         }
 
         component.Active = true;
-        Transform(storageUid).AttachToGridOrMap();
         return true;
     }
-    private void StartInsertDoAfter(EntityUid inserter, EntityUid toInsert, EntityUid storageEntity, PseudoItemComponent? pseudoItem = null)
+
+    private void StartInsertDoAfter(EntityUid inserter, EntityUid toInsert, EntityUid storageEntity,
+        PseudoItemComponent? pseudoItem = null)
     {
         if (!Resolve(toInsert, ref pseudoItem))
             return;
 
         var ev = new PseudoItemInsertDoAfterEvent();
-        var args = new DoAfterArgs(EntityManager, inserter, 5f, ev, toInsert, target: toInsert, used: storageEntity)
+        var args = new DoAfterArgs(EntityManager, inserter, 5f, ev, toInsert, toInsert, storageEntity)
         {
             BreakOnTargetMove = true,
             BreakOnUserMove = true,
@@ -157,4 +162,13 @@ private void StartInsertDoAfter(EntityUid inserter, EntityUid toInsert, EntityUi
 
         _doAfter.TryStartDoAfter(args);
     }
+
+    private void OnInsertAttempt(EntityUid uid, PseudoItemComponent component,
+        ContainerGettingInsertedAttemptEvent args)
+    {
+        if (!component.Active)
+            return;
+        // This hopefully shouldn't trigger, but this is a failsafe just in case so we dont bluespace them cats
+        args.Cancel();
+    }
 }
diff --git a/...en/Item/PseudoItem/PseudoItemComponent.cs → ...en/Item/Components/PseudoItemComponent.cs b/...en/Item/PseudoItem/PseudoItemComponent.cs → ...en/Item/Components/PseudoItemComponent.cs
@@ -1,5 +1,5 @@
 
-namespace Content.Server.Item.PseudoItem;
+namespace Content.Shared.Item.PseudoItem;
 
     /// <summary>
     /// For entities that behave like an item under certain conditions,

diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
+using Content.Shared.Item.PseudoItem;
 using Content.Shared.Lock;
 using Content.Shared.Placeable;
 using Content.Shared.Popups;
@@ -439,6 +440,9 @@ public void TransferEntities(EntityUid source, EntityUid target, EntityUid? user
 
         foreach (var entity in entities.ToArray())
         {
+            if (HasComp<PseudoItemComponent>(entity)) // Nyanotrasen - They dont transfer properly
+                continue;
+
             Insert(target, entity, out _, user: user, targetComp, playSound: false);
         }