tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix drone LINQ (#7814)

Browse Source 
wat
This commit is contained in:
metalgearsloth
2022-04-27 13:56:11 +10:00
committed by GitHub
parent 3ffe9e7219
commit e25434cba2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Drone/DroneSystem.cs
View File

@@ -92,19 +92,20 @@ namespace Content.Server.Drone
{ {
var body = Comp<SharedBodyComponent>(uid); //There's no way something can have a mobstate but not a body... var body = Comp<SharedBodyComponent>(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<UnremoveableComponent>(item.value); RemComp<UnremoveableComponent>(item);
} }
else else
{ {
EntityManager.DeleteEntity(item.value); Del(item);
} }
} }
body.Gib(); body.Gib();
EntityManager.DeleteEntity(uid); Del(uid);
} }
} }
@@ -124,7 +125,7 @@ namespace Content.Server.Drone
var items = EntitySpawnCollection.GetSpawns(drone.Tools, _robustRandom); var items = EntitySpawnCollection.GetSpawns(drone.Tools, _robustRandom);
foreach (var entry in items) foreach (var entry in items)
{ {
var item = EntityManager.SpawnEntity(entry, spawnCoord); var item = Spawn(entry, spawnCoord);
AddComp<UnremoveableComponent>(item); AddComp<UnremoveableComponent>(item);
if (!_handsSystem.TryPickupAnyHand(uid, item, checkActionBlocker: false)) if (!_handsSystem.TryPickupAnyHand(uid, item, checkActionBlocker: false))
{ {