Hotfix for Body Bags (#9155)

* Oops * Requested changes * Renamed * rename Co-authored-by: metalgearsloth <[email protected]>
space-wizards · Jun 27, 2022 · a265cd8 · a265cd8
1 parent e9d6156
commit a265cd8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/Content.Server/Foldable/FoldableSystem.cs b/Content.Server/Foldable/FoldableSystem.cs
@@ -19,7 +19,8 @@ public override void Initialize()
 
             SubscribeLocalEvent<FoldableComponent, StorageOpenAttemptEvent>(OnFoldableOpenAttempt);
             SubscribeLocalEvent<FoldableComponent, GetVerbsEvent<AlternativeVerb>>(AddFoldVerb);
-            SubscribeLocalEvent<FoldableComponent, InsertIntoEntityStorageAttemptEvent>(OnEntityStorageInsertAttempt);
+            SubscribeLocalEvent<FoldableComponent, StoreThisAttemptEvent>(OnStoreThisAttempt);
+
         }
 
         private void OnFoldableOpenAttempt(EntityUid uid, FoldableComponent component, StorageOpenAttemptEvent args)
@@ -87,9 +88,9 @@ public override void SetFolded(FoldableComponent component, bool folded)
                 strap.Enabled = !component.IsFolded;
         }
 
-        public void OnEntityStorageInsertAttempt(EntityUid uid, FoldableComponent comp, InsertIntoEntityStorageAttemptEvent args)
+        public void OnStoreThisAttempt(EntityUid uid, FoldableComponent comp, StoreThisAttemptEvent args)
         {
-            if (!comp.IsFolded)
+            if (comp.IsFolded)
                 args.Cancel();
         }
 

diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs
@@ -216,14 +216,13 @@ public virtual bool CanFit(EntityUid entity)
             // 4. items can always be eaten unless a previous law prevents it
             // 5. if this is NOT AN ITEM, then mobs can always be eaten unless unless a previous law prevents it
             // 6. if this is an item, then mobs must only be eaten if some other component prevents pick-up interactions while a mob is inside (e.g. foldable)
-
             var attemptEvent = new InsertIntoEntityStorageAttemptEvent();
             _entMan.EventBus.RaiseLocalEvent(entity, attemptEvent);
             if (attemptEvent.Cancelled)
                 return false;
 
             // checks
-
+            // TODO: Make the others sub to it.
             var targetIsItem = _entMan.HasComponent<SharedItemComponent>(entity);
             var targetIsMob = _entMan.HasComponent<SharedBodyComponent>(entity);
             var storageIsItem = _entMan.HasComponent<SharedItemComponent>(Owner);
@@ -239,9 +238,14 @@ public virtual bool CanFit(EntityUid entity)
             {
                 if (!storageIsItem)
                     allowedToEat = true;
+                else
+                {
+                    var storeEv = new StoreThisAttemptEvent();
+                    _entMan.EventBus.RaiseLocalEvent(Owner, storeEv);
+                    allowedToEat = !storeEv.Cancelled;
+                }
             }
 
-            _entMan.EventBus.RaiseLocalEvent(entity, allowedToEat);
             return allowedToEat;
         }
 
@@ -367,6 +371,11 @@ protected virtual IEnumerable<EntityUid> DetermineCollidingEntities()
     public sealed class InsertIntoEntityStorageAttemptEvent : CancellableEntityEventArgs
     {
 
+    }
+
+    public sealed class StoreThisAttemptEvent : CancellableEntityEventArgs
+    {
+
     }
     public sealed class StorageOpenAttemptEvent : CancellableEntityEventArgs
     {

diff --git a/Content.Shared/Foldable/SharedFoldableSystem.cs b/Content.Shared/Foldable/SharedFoldableSystem.cs
@@ -47,7 +47,7 @@ private void OnFoldableInit(EntityUid uid, FoldableComponent component, Componen
     public virtual void SetFolded(FoldableComponent component, bool folded)
     {
         component.IsFolded = folded;
-        component.Dirty();
+        Dirty(component);
 
         if (TryComp(component.Owner, out AppearanceComponent? appearance))
             appearance.SetData(FoldKey, folded);