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

Inline Transform

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:20:34 +01:00
parent 69b270017b
commit a5b57c8e10
283 changed files with 742 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Gravity/EntitySystems/GravityGeneratorSystem.cs
View File

@@ -184,7 +184,7 @@ namespace Content.Server.Gravity.EntitySystems
private void UpdateGravityActive(GravityGeneratorComponent grav, bool shake)
{
var gridId = grav.Owner.Transform.GridID;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(grav.Owner.Uid).GridID;
if (gridId == GridId.Invalid)
return;

2
Content.Server/Gravity/EntitySystems/GravityShakeSystem.cs
View File

@@ -80,7 +80,7 @@ namespace Content.Server.Gravity.EntitySystems
foreach (var player in _playerManager.Sessions)
{
if (player.AttachedEntity == null
|| player.AttachedEntity.Transform.GridID != gridId
|| IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity.Uid).GridID != gridId
|| !IoCManager.Resolve<IEntityManager>().TryGetComponent(player.AttachedEntity.Uid, out CameraRecoilComponent? recoil))
{
continue;

9
Content.Server/Gravity/EntitySystems/GravitySystem.cs
View File

@@ -1,6 +1,7 @@
using Content.Shared.Gravity;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.Gravity.EntitySystems
{
@@ -16,12 +17,12 @@ namespace Content.Server.Gravity.EntitySystems
private void HandleGravityInitialize(EntityUid uid, GravityComponent component, ComponentInit args)
{
// Incase there's already a generator on the grid we'll just set it now.
var gridId = component.Owner.Transform.GridID;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner.Uid).GridID;
GravityChangedMessage message;
foreach (var generator in EntityManager.EntityQuery<GravityGeneratorComponent>())
{
if (generator.Owner.Transform.GridID == gridId && generator.GravityActive)
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(generator.Owner.Uid).GridID == gridId && generator.GravityActive)
{
component.Enabled = true;
message = new GravityChangedMessage(gridId, true);
@@ -40,7 +41,7 @@ namespace Content.Server.Gravity.EntitySystems
if (comp.Enabled) return;
comp.Enabled = true;
var gridId = comp.Owner.Transform.GridID;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(comp.Owner.Uid).GridID;
var message = new GravityChangedMessage(gridId, true);
RaiseLocalEvent(message);
}
@@ -50,7 +51,7 @@ namespace Content.Server.Gravity.EntitySystems
if (!comp.Enabled) return;
comp.Enabled = false;
var gridId = comp.Owner.Transform.GridID;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(comp.Owner.Uid).GridID;
var message = new GravityChangedMessage(gridId, false);
RaiseLocalEvent(message);
}

8
Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
View File

@@ -34,12 +34,12 @@ namespace Content.Server.Gravity.EntitySystems
public void AddAlert(ServerAlertsComponent status)
{
var gridId = status.Owner.Transform.GridID;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(status.Owner.Uid).GridID;
var alerts = _alerts.GetOrNew(gridId);
alerts.Add(status);
if (_mapManager.TryGetGrid(status.Owner.Transform.GridID, out var grid))
if (_mapManager.TryGetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(status.Owner.Uid).GridID, out var grid))
{
var gridEntity = EntityManager.GetEntity(grid.GridEntityId);
if (IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(gridEntity.Uid).Enabled)
@@ -55,7 +55,7 @@ namespace Content.Server.Gravity.EntitySystems
public void RemoveAlert(ServerAlertsComponent status)
{
var grid = status.Owner.Transform.GridID;
var grid = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(status.Owner.Uid).GridID;
if (!_alerts.TryGetValue(grid, out var statuses))
{
return;
@@ -115,7 +115,7 @@ namespace Content.Server.Gravity.EntitySystems
}
}
var newGrid = ev.Entity.Transform.GridID;
var newGrid = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ev.Entity.Uid).GridID;
var newStatuses = _alerts.GetOrNew(newGrid);
newStatuses.Add(status);