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

3
Content.Server/DeviceNetwork/Systems/WiredNetworkSystem.cs
View File

@@ -5,6 +5,7 @@ using Content.Server.Power.Components;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using System.Diagnostics.CodeAnalysis;
using Robust.Shared.IoC;
namespace Content.Server.DeviceNetwork.Systems
{
@@ -25,7 +26,7 @@ namespace Content.Server.DeviceNetwork.Systems
IEntity sender = EntityManager.GetEntity(args.Sender);
IEntity receiver = EntityManager.GetEntity(uid);
if (receiver.Transform.GridID != sender.Transform.GridID)
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(receiver.Uid).GridID != IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(sender.Uid).GridID)
{
args.Cancel();
}

4
Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs
View File

@@ -21,8 +21,8 @@ namespace Content.Server.DeviceNetwork.Systems
{
var sender = EntityManager.GetEntity(args.Sender);
var ownPosition = component.Owner.Transform.WorldPosition;
var position = sender.Transform.WorldPosition;
var ownPosition = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner.Uid).WorldPosition;
var position = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(sender.Uid).WorldPosition;
var distance = (ownPosition - position).Length;
if(IoCManager.Resolve<IEntityManager>().TryGetComponent<WirelessNetworkComponent?>(sender.Uid, out var sendingComponent) && distance > sendingComponent.Range)