Requested Changes part 4

space-wizards · Jan 15, 2025 · 4d685ae · 4d685ae
1 parent 0828c0f
commit 4d685ae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/Content.Shared/ItemRecall/ItemRecallEvents.cs b/Content.Shared/ItemRecall/ItemRecallEvents.cs
@@ -3,7 +3,7 @@
 namespace Content.Shared.ItemRecall;
 
 /// <summary>
-/// Raise on using the ItemRecall action.
+/// Raised when using the ItemRecall action.
 /// </summary>
 [ByRefEvent]
 public sealed partial class OnItemRecallActionEvent : InstantActionEvent;

diff --git a/Content.Shared/ItemRecall/SharedItemRecallSystem.cs b/Content.Shared/ItemRecall/SharedItemRecallSystem.cs
@@ -101,9 +101,9 @@ private void RecallItem(Entity<RecallMarkerComponent> ent)
             return;
 
         if (TryComp<EmbeddableProjectileComponent>(ent, out var projectile))
-            _proj.UnEmbed(ent, ent.Comp.MarkedByEntity.Value, projectile);
+            _proj.UnEmbed(ent, projectile, ent.Comp.MarkedByEntity.Value);
 
-        _popups.PopupEntity(Loc.GetString("item-recall-item-summon", ("item", ent)), ent.Comp.MarkedByEntity.Value, ent.Comp.MarkedByEntity.Value);
+        _popups.PopupPredicted(Loc.GetString("item-recall-item-summon", ("item", ent)), ent.Comp.MarkedByEntity.Value, ent.Comp.MarkedByEntity.Value);
 
         _hands.TryForcePickupAnyHand(ent.Comp.MarkedByEntity.Value, ent);
     }

diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -67,7 +67,7 @@ private void OnEmbedRemove(EntityUid uid, EmbeddableProjectileComponent componen
             return;
         }
 
-        UnEmbed(uid, args.User, component);
+        UnEmbed(uid, component, args.User);
 
         // try place it in the user's hand
         _hands.TryPickupAnyHand(args.User, uid);
@@ -117,7 +117,7 @@ private void Embed(EntityUid uid, EntityUid target, EntityUid? user, EmbeddableP
         Dirty(uid, component);
     }
 
-    public void UnEmbed(EntityUid uid, EntityUid user, EmbeddableProjectileComponent? component)
+    public void UnEmbed(EntityUid uid, EmbeddableProjectileComponent? component, EntityUid? user = null)
     {
         if (!Resolve(uid, ref component))
             return;
@@ -137,9 +137,13 @@ public void UnEmbed(EntityUid uid, EntityUid user, EmbeddableProjectileComponent
             projectile.DamagedEntity = false;
         }
 
-        // Land it just coz uhhh yeah
-        var landEv = new LandEvent(user, true);
-        RaiseLocalEvent(uid, ref landEv);
+        if (user != null)
+        {
+            // Land it just coz uhhh yeah
+            var landEv = new LandEvent(user, true);
+            RaiseLocalEvent(uid, ref landEv);
+        }
+
         _physics.WakeBody(uid, body: physics);
     }