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

removes componentdependencies (#6160)

Browse Source
This commit is contained in:
Paul Ritter
2022-01-15 03:26:37 +01:00
committed by GitHub
parent 46405ec165
commit 9e1607722d
33 changed files with 257 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Shared/Doors/SharedDoorComponent.cs
View File

@@ -16,15 +16,11 @@ namespace Content.Shared.Doors
{
public override string Name => "Door";
[ComponentDependency]
protected readonly AppearanceComponent? AppearanceComponent = null;
[ComponentDependency]
protected readonly IPhysBody? PhysicsComponent = null;
[Dependency]
protected readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IEntityManager _entMan = default!;
[ViewVariables]
private DoorState _state = DoorState.Closed;
/// <summary>
@@ -104,7 +100,10 @@ namespace Content.Shared.Doors
protected void SetAppearance(DoorVisualState state)
{
AppearanceComponent?.SetData(DoorVisuals.VisualState, state);
if (_entMan.TryGetComponent<AppearanceComponent>(Owner, out var appearanceComponent))
{
appearanceComponent.SetData(DoorVisuals.VisualState, state);
}
}
/// <summary>
@@ -112,9 +111,9 @@ namespace Content.Shared.Doors
/// </summary>
protected virtual void OnPartialOpen()
{
if (PhysicsComponent != null)
if (_entMan.TryGetComponent<PhysicsComponent>(Owner, out var physicsComponent))
{
PhysicsComponent.CanCollide = false;
physicsComponent.CanCollide = false;
}
// we can't be crushing anyone anymore, since we're opening
CurrentlyCrushing.Clear();
@@ -125,9 +124,9 @@ namespace Content.Shared.Doors
/// </summary>
protected virtual void OnPartialClose()
{
if (PhysicsComponent != null)
if (_entMan.TryGetComponent<PhysicsComponent>(Owner, out var physicsComponent))
{
PhysicsComponent.CanCollide = true;
physicsComponent.CanCollide = true;
}
}