More manual fixes.
This commit is contained in:
@@ -36,7 +36,7 @@ namespace Content.Client.Construction
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override bool HijackDeletion(IEntity entity)
|
||||
public override bool HijackDeletion(EntityUid entity)
|
||||
{
|
||||
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ConstructionGhostComponent? ghost))
|
||||
{
|
||||
|
||||
@@ -153,7 +153,7 @@ namespace Content.IntegrationTests.Tests.Body
|
||||
MapId mapId;
|
||||
IMapGrid grid = null;
|
||||
RespiratorComponent respirator = null;
|
||||
IEntity human = null;
|
||||
EntityUid human = null;
|
||||
|
||||
var testMapName = "Maps/Test/Breathing/3by3-20oxy-80nit.yml";
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace Content.IntegrationTests.Tests.Destructible
|
||||
var sPrototypeManager = server.ResolveDependency<IPrototypeManager>();
|
||||
var sEntitySystemManager = server.ResolveDependency<IEntitySystemManager>();
|
||||
|
||||
IEntity sDestructibleEntity = null; ;
|
||||
EntityUid sDestructibleEntity = null; ;
|
||||
DamageableComponent sDamageableComponent = null;
|
||||
DestructibleComponent sDestructibleComponent = null;
|
||||
TestDestructibleListenerSystem sTestThresholdListenerSystem = null;
|
||||
|
||||
@@ -56,7 +56,7 @@ namespace Content.IntegrationTests.Tests.Doors
|
||||
var mapManager = server.ResolveDependency<IMapManager>();
|
||||
var entityManager = server.ResolveDependency<IEntityManager>();
|
||||
|
||||
IEntity airlock = null;
|
||||
EntityUid airlock = null;
|
||||
ServerDoorComponent doorComponent = null;
|
||||
|
||||
server.Assert(() =>
|
||||
@@ -121,8 +121,8 @@ namespace Content.IntegrationTests.Tests.Doors
|
||||
var entityManager = server.ResolveDependency<IEntityManager>();
|
||||
|
||||
IPhysBody physBody = null;
|
||||
IEntity physicsDummy = null;
|
||||
IEntity airlock = null;
|
||||
EntityUid physicsDummy = null;
|
||||
EntityUid airlock = null;
|
||||
ServerDoorComponent doorComponent = null;
|
||||
|
||||
var physicsDummyStartingX = -1;
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace Content.IntegrationTests.Tests
|
||||
|
||||
var prototypes = new List<EntityPrototype>();
|
||||
IMapGrid grid = default;
|
||||
IEntity testEntity;
|
||||
EntityUid testEntity;
|
||||
|
||||
//Build up test environment
|
||||
server.Post(() =>
|
||||
|
||||
@@ -90,7 +90,7 @@ namespace Content.IntegrationTests.Tests.Fluids
|
||||
MapId sMapId = default;
|
||||
IMapGrid sGrid;
|
||||
GridId sGridId = default;
|
||||
IEntity sGridEntity = null;
|
||||
EntityUid sGridEntity = null;
|
||||
EntityCoordinates sCoordinates = default;
|
||||
|
||||
// Spawn a paused map with one tile to spawn puddles on
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
using System.Text.Json;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
|
||||
namespace Content.Server.Administration.Logs.Converters;
|
||||
|
||||
[AdminLogConverter]
|
||||
public class EntityConverter : AdminLogConverter<IEntity>
|
||||
{
|
||||
[Dependency] private readonly IEntityManager _entities = default!;
|
||||
|
||||
public override void Write(Utf8JsonWriter writer, IEntity value, JsonSerializerOptions options)
|
||||
{
|
||||
EntityUidConverter.Write(writer, value, options, _entities);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user