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

More (IComponent) shenanigans and also some contaminated IoCManager.Resolve<IEntityManager>() very long yes calls

Browse Source
This commit is contained in:
metalgearsloth
2021-12-07 22:22:34 +11:00
parent 373b5988d7
commit 8af335097f
55 changed files with 176 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Server.Disposal.Tube.Components
EntitySystem.Get<AtmosphereSystem>().Merge(holderComponent.Air, from.Air);
from.Air.Clear();
return EntitySystem.Get<DisposableSystem>().EnterTube(((IComponent) holderComponent).Owner, Owner, holderComponent, null, this);
return EntitySystem.Get<DisposableSystem>().EnterTube((holderComponent).Owner, Owner, holderComponent, null, this);
}
protected override Direction[] ConnectableDirections()

2
Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
View File

@@ -93,7 +93,7 @@ namespace Content.Server.Disposal.Tube.Components
continue;
}
EntitySystem.Get<DisposableSystem>().ExitDisposals(((IComponent) holder).Owner);
EntitySystem.Get<DisposableSystem>().ExitDisposals((holder).Owner);
}
}

8
Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
View File

@@ -59,7 +59,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
if (duc != null)
{
// Insert into disposal unit
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates = new EntityCoordinates(((IComponent) duc).Owner, Vector2.Zero);
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates = new EntityCoordinates((duc).Owner, Vector2.Zero);
duc.Container.Insert(entity);
}
else
@@ -154,7 +154,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
var currentTube = holder.CurrentTube;
if (currentTube == null || currentTube.Deleted)
{
ExitDisposals(((IComponent) holder).Owner);
ExitDisposals((holder).Owner);
break;
}
@@ -178,12 +178,12 @@ namespace Content.Server.Disposal.Unit.EntitySystems
var nextTube = _disposalTubeSystem.NextTubeFor(currentTube.Owner, holder.CurrentDirection);
if (nextTube == null || nextTube.Deleted)
{
ExitDisposals(((IComponent) holder).Owner);
ExitDisposals((holder).Owner);
break;
}
// Perform remainder of entry process
if (!EnterTube(((IComponent) holder).Owner, nextTube.Owner, holder, null, nextTube, null))
if (!EnterTube((holder).Owner, nextTube.Owner, holder, null, nextTube, null))
{
break;
}