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

Construction warning cleanup (#12256)

Browse Source
This commit is contained in:
Nemanja
2022-10-30 02:48:53 -04:00
committed by GitHub
parent 1a6d084c4d
commit b6135d3be5
47 changed files with 166 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Construction/Commands/FixRotationsCommand.cs
View File

@@ -63,7 +63,7 @@ namespace Content.Server.Construction.Commands
}
var changed = 0;
var tagSystem = EntitySystem.Get<TagSystem>();
var tagSystem = entityManager.EntitySysManager.GetEntitySystem<TagSystem>();
foreach (var child in xformQuery.GetComponent(grid.GridEntityId).ChildEntities)
{

7
Content.Server/Construction/Commands/TileReplaceCommand.cs
View File

@@ -1,11 +1,8 @@
using Content.Server.Administration;
using Content.Shared.Administration;
using Content.Shared.Maps;
using Content.Shared.Tag;
using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.Map;
using Robust.Shared.Prototypes;
namespace Content.Server.Construction.Commands;
@@ -22,8 +19,8 @@ sealed class TileReplaceCommand : IConsoleCommand
var player = shell.Player as IPlayerSession;
var entityManager = IoCManager.Resolve<IEntityManager>();
EntityUid? gridId;
string tileIdA = "";
string tileIdB = "";
string tileIdA;
string tileIdB;
switch (args.Length)
{

9
Content.Server/Construction/Commands/TileWallsCommand.cs
View File

@@ -5,7 +5,6 @@ using Content.Shared.Tag;
using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.Map;
using Robust.Shared.Prototypes;
namespace Content.Server.Construction.Commands
{
@@ -17,7 +16,7 @@ namespace Content.Server.Construction.Commands
public string Description => "Puts an underplating tile below every wall on a grid.";
public string Help => $"Usage: {Command} <gridId> | {Command}";
public const string TilePrototypeID = "Plating";
public const string TilePrototypeId = "Plating";
public const string WallTag = "Wall";
public void Execute(IConsoleShell shell, string argStr, string[] args)
@@ -65,8 +64,8 @@ namespace Content.Server.Construction.Commands
}
var tileDefinitionManager = IoCManager.Resolve<ITileDefinitionManager>();
var tagSystem = EntitySystem.Get<TagSystem>();
var underplating = tileDefinitionManager[TilePrototypeID];
var tagSystem = entityManager.EntitySysManager.GetEntitySystem<TagSystem>();
var underplating = tileDefinitionManager[TilePrototypeId];
var underplatingTile = new Tile(underplating.TileId);
var changed = 0;
foreach (var child in entityManager.GetComponent<TransformComponent>(grid.GridEntityId).ChildEntities)
@@ -91,7 +90,7 @@ namespace Content.Server.Construction.Commands
var tile = grid.GetTileRef(childTransform.Coordinates);
var tileDef = (ContentTileDefinition) tileDefinitionManager[tile.Tile.TypeId];
if (tileDef.ID == TilePrototypeID)
if (tileDef.ID == TilePrototypeId)
{
continue;
}