Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix 3000 errors

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Atmos/Commands/AddAtmosCommand.cs
View File

@@ -11,6 +11,8 @@ namespace Content.Server.Atmos.Commands
[AdminCommand(AdminFlags.Debug)]
public class AddAtmosCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entities = default!;
public string Command => "addatmos";
public string Description => "Adds atmos support to a grid.";
public string Help => $"{Command} <GridId>";
@@ -39,21 +41,19 @@ namespace Content.Server.Atmos.Commands
return;
}
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
if (!_entities.EntityExists(gridComp.GridEntityId))
{
shell.WriteLine("Failed to get grid entity.");
return;
}
if (IoCManager.Resolve<IEntityManager>().HasComponent<IAtmosphereComponent>(grid))
if (_entities.HasComponent<IAtmosphereComponent>(gridComp.GridEntityId))
{
shell.WriteLine("Grid already has an atmosphere.");
return;
}
IoCManager.Resolve<IEntityManager>().AddComponent<GridAtmosphereComponent>(grid);
_entities.AddComponent<GridAtmosphereComponent>(gridComp.GridEntityId);
shell.WriteLine($"Added atmosphere to grid {id}.");
}

6
Content.Server/Atmos/Commands/AddUnsimulatedAtmosCommand.cs
View File

@@ -41,19 +41,19 @@ namespace Content.Server.Atmos.Commands
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
if (!entMan.EntityExists(gridComp.GridEntityId))
{
shell.WriteLine("Failed to get grid entity.");
return;
}
if (IoCManager.Resolve<IEntityManager>().HasComponent<IAtmosphereComponent>(grid))
if (entMan.HasComponent<IAtmosphereComponent>(gridComp.GridEntityId))
{
shell.WriteLine("Grid already has an atmosphere.");
return;
}
IoCManager.Resolve<IEntityManager>().AddComponent<UnsimulatedGridAtmosphereComponent>(grid);
entMan.AddComponent<UnsimulatedGridAtmosphereComponent>(gridComp.GridEntityId);
shell.WriteLine($"Added unsimulated atmosphere to grid {id}.");
}

10
Content.Server/Atmos/Commands/DeleteGasCommand.cs
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)
{