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

More manual fixes.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 17:35:20 +01:00
parent 54ab29502a
commit f5b8bb3731
7 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Construction/ConstructionPlacementHijack.cs
View File

@@ -36,7 +36,7 @@ namespace Content.Client.Construction
} }
/// <inheritdoc /> /// <inheritdoc />
public override bool HijackDeletion(IEntity entity) public override bool HijackDeletion(EntityUid entity)
{ {
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ConstructionGhostComponent? ghost)) if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ConstructionGhostComponent? ghost))
{ {

2
Content.IntegrationTests/Tests/Body/LungTest.cs
View File

@@ -153,7 +153,7 @@ namespace Content.IntegrationTests.Tests.Body
MapId mapId; MapId mapId;
IMapGrid grid = null; IMapGrid grid = null;
RespiratorComponent respirator = null; RespiratorComponent respirator = null;
IEntity human = null; EntityUid human = null;
var testMapName = "Maps/Test/Breathing/3by3-20oxy-80nit.yml"; var testMapName = "Maps/Test/Breathing/3by3-20oxy-80nit.yml";

2
Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
View File

@@ -36,7 +36,7 @@ namespace Content.IntegrationTests.Tests.Destructible
var sPrototypeManager = server.ResolveDependency<IPrototypeManager>(); var sPrototypeManager = server.ResolveDependency<IPrototypeManager>();
var sEntitySystemManager = server.ResolveDependency<IEntitySystemManager>(); var sEntitySystemManager = server.ResolveDependency<IEntitySystemManager>();
IEntity sDestructibleEntity = null; ; EntityUid sDestructibleEntity = null; ;
DamageableComponent sDamageableComponent = null; DamageableComponent sDamageableComponent = null;
DestructibleComponent sDestructibleComponent = null; DestructibleComponent sDestructibleComponent = null;
TestDestructibleListenerSystem sTestThresholdListenerSystem = null; TestDestructibleListenerSystem sTestThresholdListenerSystem = null;

6
Content.IntegrationTests/Tests/Doors/AirlockTest.cs
View File

@@ -56,7 +56,7 @@ namespace Content.IntegrationTests.Tests.Doors
var mapManager = server.ResolveDependency<IMapManager>(); var mapManager = server.ResolveDependency<IMapManager>();
var entityManager = server.ResolveDependency<IEntityManager>(); var entityManager = server.ResolveDependency<IEntityManager>();
IEntity airlock = null; EntityUid airlock = null;
ServerDoorComponent doorComponent = null; ServerDoorComponent doorComponent = null;
server.Assert(() => server.Assert(() =>
@@ -121,8 +121,8 @@ namespace Content.IntegrationTests.Tests.Doors
var entityManager = server.ResolveDependency<IEntityManager>(); var entityManager = server.ResolveDependency<IEntityManager>();
IPhysBody physBody = null; IPhysBody physBody = null;
IEntity physicsDummy = null; EntityUid physicsDummy = null;
IEntity airlock = null; EntityUid airlock = null;
ServerDoorComponent doorComponent = null; ServerDoorComponent doorComponent = null;
var physicsDummyStartingX = -1; var physicsDummyStartingX = -1;

2
Content.IntegrationTests/Tests/EntityTest.cs
View File

@@ -37,7 +37,7 @@ namespace Content.IntegrationTests.Tests
var prototypes = new List<EntityPrototype>(); var prototypes = new List<EntityPrototype>();
IMapGrid grid = default; IMapGrid grid = default;
IEntity testEntity; EntityUid testEntity;
//Build up test environment //Build up test environment
server.Post(() => server.Post(() =>

2
Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
View File

@@ -90,7 +90,7 @@ namespace Content.IntegrationTests.Tests.Fluids
MapId sMapId = default; MapId sMapId = default;
IMapGrid sGrid; IMapGrid sGrid;
GridId sGridId = default; GridId sGridId = default;
IEntity sGridEntity = null; EntityUid sGridEntity = null;
EntityCoordinates sCoordinates = default; EntityCoordinates sCoordinates = default;
// Spawn a paused map with one tile to spawn puddles on // Spawn a paused map with one tile to spawn puddles on

17
Content.Server/Administration/Logs/Converters/EntityConverter.cs
View File

@@ -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);
}
}