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

MakeGhostRoleCommand uses EntityUid

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 15:50:55 +01:00
parent 6803c52fe9
commit 5b4c813c6d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs
View File

@@ -32,16 +32,16 @@ namespace Content.Server.Ghost.Roles
return; return;
} }
if (!entityManager.TryGetEntity(uid, out var entity)) if (!entityManager.TryGetComponent(uid, out MetaDataComponent? metaData))
{ {
shell.WriteLine($"No entity found with uid {uid}"); shell.WriteLine($"No entity found with uid {uid}");
return; return;
} }
if (entity.TryGetComponent(out MindComponent? mind) && if (entityManager.TryGetComponent(uid, out MindComponent? mind) &&
mind.HasMind) mind.HasMind)
{ {
shell.WriteLine($"Entity {entity.Name} with id {uid} already has a mind."); shell.WriteLine($"Entity {metaData.EntityName} with id {uid} already has a mind.");
return; return;
} }
@@ -49,17 +49,18 @@ namespace Content.Server.Ghost.Roles
var description = args[2]; var description = args[2];
var rules = args.Length >= 4 ? args[3] : Loc.GetString("ghost-role-component-default-rules"); var rules = args.Length >= 4 ? args[3] : Loc.GetString("ghost-role-component-default-rules");
if (entity.EnsureComponent(out GhostTakeoverAvailableComponent takeOver)) if (entityManager.TryGetComponent(uid, out GhostTakeoverAvailableComponent? takeOver))
{ {
shell.WriteLine($"Entity {entity.Name} with id {uid} already has a {nameof(GhostTakeoverAvailableComponent)}"); shell.WriteLine($"Entity {metaData.EntityName} with id {uid} already has a {nameof(GhostTakeoverAvailableComponent)}");
return; return;
} }
takeOver = entityManager.AddComponent<GhostTakeoverAvailableComponent>(uid);
takeOver.RoleName = name; takeOver.RoleName = name;
takeOver.RoleDescription = description; takeOver.RoleDescription = description;
takeOver.RoleRules = rules; takeOver.RoleRules = rules;
shell.WriteLine($"Made entity {entity.Name} a ghost role."); shell.WriteLine($"Made entity {metaData.EntityName} a ghost role.");
} }
} }
} }