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

Fix errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 21:02:04 +01:00
parent 2a3b7d809d
commit ab9d0cc6d8
94 changed files with 568 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/Damage/Commands/HurtCommand.cs
View File

@@ -43,16 +43,13 @@ namespace Content.Server.Damage.Commands
private delegate void Damage(EntityUid entity, bool ignoreResistances);
private bool TryParseEntity(IConsoleShell shell, IPlayerSession? player, string arg,
[NotNullWhen(true)] out EntityUid entity)
private bool TryParseEntity(IConsoleShell shell, IPlayerSession? player, string arg, out EntityUid entity)
{
entity = null;
entity = default;
if (arg == "_")
{
var playerEntity = player?.AttachedEntity;
if (playerEntity == null)
if (player?.AttachedEntity is not {Valid: true} playerEntity)
{
shell.WriteLine($"You must have a player entity to use this command without specifying an entity.\n{Help}");
return false;
@@ -62,23 +59,20 @@ namespace Content.Server.Damage.Commands
return true;
}
if (!EntityUid.TryParse(arg, out var entityUid))
if (!EntityUid.TryParse(arg, out entity))
{
shell.WriteLine($"{arg} is not a valid entity uid.\n{Help}");
return false;
}
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!entityManager.EntityExists(entityUid)
if (!entityManager.EntityExists(entity))
{
shell.WriteLine($"No entity found with uid {entityUid}");
shell.WriteLine($"No entity found with uid {entity}");
return false;
}
entity = parsedEntity;
return true;
}