Remove spawn point component references (#15222)

This commit is contained in:
DrSmugleaf
2023-04-08 16:52:52 -07:00
committed by GitHub
parent 34bcd042d1
commit cf19015086
3 changed files with 20 additions and 32 deletions

View File

@@ -23,7 +23,6 @@ using Content.Shared.Administration;
using Content.Shared.AME; using Content.Shared.AME;
using Content.Shared.Gravity; using Content.Shared.Gravity;
using Content.Shared.Localizations; using Content.Shared.Localizations;
using Content.Shared.Markers;
using Robust.Client; using Robust.Client;
using Robust.Client.Graphics; using Robust.Client.Graphics;
using Robust.Client.Input; using Robust.Client.Input;
@@ -85,7 +84,6 @@ namespace Content.Client.Entry
_componentFactory.IgnoreMissingComponents(); _componentFactory.IgnoreMissingComponents();
// Do not add to these, they are legacy. // Do not add to these, they are legacy.
_componentFactory.RegisterClass<SharedSpawnPointComponent>();
_componentFactory.RegisterClass<SharedGravityGeneratorComponent>(); _componentFactory.RegisterClass<SharedGravityGeneratorComponent>();
_componentFactory.RegisterClass<SharedAMEControllerComponent>(); _componentFactory.RegisterClass<SharedAMEControllerComponent>();
// Do not add to the above, they are legacy // Do not add to the above, they are legacy

View File

@@ -1,13 +1,11 @@
using Content.Shared.Markers;
using Content.Shared.Roles; using Content.Shared.Roles;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
namespace Content.Server.Spawners.Components namespace Content.Server.Spawners.Components;
[RegisterComponent]
public sealed class SpawnPointComponent : Component
{ {
[RegisterComponent]
[ComponentReference(typeof(SharedSpawnPointComponent))]
public sealed class SpawnPointComponent : SharedSpawnPointComponent
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
@@ -19,13 +17,12 @@ namespace Content.Server.Spawners.Components
public SpawnPointType SpawnType { get; } = SpawnPointType.Unset; public SpawnPointType SpawnType { get; } = SpawnPointType.Unset;
public JobPrototype? Job => string.IsNullOrEmpty(_jobId) ? null : _prototypeManager.Index<JobPrototype>(_jobId); public JobPrototype? Job => string.IsNullOrEmpty(_jobId) ? null : _prototypeManager.Index<JobPrototype>(_jobId);
} }
public enum SpawnPointType public enum SpawnPointType
{ {
Unset = 0, Unset = 0,
LateJoin, LateJoin,
Job, Job,
Observer, Observer,
}
} }

View File

@@ -1,7 +0,0 @@
namespace Content.Shared.Markers
{
[Virtual]
public class SharedSpawnPointComponent : Component
{
}
}