Fix 3000 errors

This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions

View File

@@ -27,19 +27,20 @@ namespace Content.Server.Atmos.Commands
switch (args.Length)
{
case 0:
{
if (player == null)
{
shell.WriteLine("A grid must be specified when the command isn't used by a player.");
return;
}
if (player.AttachedEntity == null)
if (player.AttachedEntity is not {Valid: true} playerEntity)
{
shell.WriteLine("You have no entity to get a grid from.");
return;
}
gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity).GridID;
gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(playerEntity).GridID;
if (gridId == GridId.Invalid)
{
@@ -48,6 +49,7 @@ namespace Content.Server.Atmos.Commands
}
break;
}
case 1:
{
if (!int.TryParse(args[0], out var number))
@@ -59,13 +61,13 @@ namespace Content.Server.Atmos.Commands
return;
}
if (player.AttachedEntity == null)
if (player.AttachedEntity is not {Valid: true} playerEntity)
{
shell.WriteLine("You have no entity from which to get a grid id.");
return;
}
gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity).GridID;
gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(playerEntity).GridID;
if (gridId == GridId.Invalid)
{