From e25434cba2e28cedbce78011bf20fe8f48b83c9f Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 27 Apr 2022 13:56:11 +1000 Subject: [PATCH] Fix drone LINQ (#7814) wat --- Content.Server/Drone/DroneSystem.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Content.Server/Drone/DroneSystem.cs b/Content.Server/Drone/DroneSystem.cs index 474827983e..d2d026079a 100644 --- a/Content.Server/Drone/DroneSystem.cs +++ b/Content.Server/Drone/DroneSystem.cs @@ -92,19 +92,20 @@ namespace Content.Server.Drone { var body = Comp(uid); //There's no way something can have a mobstate but not a body... - foreach (var item in drone.ToolUids.Select((value, i) => ( value, i ))) + foreach (var item in drone.ToolUids) { - if (_tagSystem.HasTag(item.value, "Drone")) + if (_tagSystem.HasTag(item, "Drone")) { - RemComp(item.value); + RemComp(item); } else { - EntityManager.DeleteEntity(item.value); + Del(item); } } + body.Gib(); - EntityManager.DeleteEntity(uid); + Del(uid); } } @@ -124,7 +125,7 @@ namespace Content.Server.Drone var items = EntitySpawnCollection.GetSpawns(drone.Tools, _robustRandom); foreach (var entry in items) { - var item = EntityManager.SpawnEntity(entry, spawnCoord); + var item = Spawn(entry, spawnCoord); AddComp(item); if (!_handsSystem.TryPickupAnyHand(uid, item, checkActionBlocker: false)) {