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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs
View File

@@ -36,7 +36,7 @@ namespace Content.Server.DeviceNetwork.Systems
private void OnProviderConnected(EntityUid uid, ApcNetworkComponent component, ExtensionCableSystem.ProviderConnectedEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Provider.Owner.Uid, out NodeContainerComponent? nodeContainer)) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Provider.Owner, out NodeContainerComponent? nodeContainer)) return;
if (nodeContainer.TryGetNode("power", out CableNode? node))
{

6
Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
View File

@@ -211,12 +211,12 @@ namespace Content.Server.DeviceNetwork.Systems
{
foreach (var connection in connections)
{
var beforeEvent = new BeforePacketSentEvent(packet.Sender.Owner.Uid);
RaiseLocalEvent(connection.Owner.Uid, beforeEvent, false);
var beforeEvent = new BeforePacketSentEvent(packet.Sender.Owner);
RaiseLocalEvent(connection.Owner, beforeEvent, false);
if (!beforeEvent.Cancelled)
{
RaiseLocalEvent(connection.Owner.Uid, new PacketSentEvent(connection.Frequency, packet.Sender.Address, packet.Data, packet.Broadcast) , false);
RaiseLocalEvent(connection.Owner, new PacketSentEvent(connection.Frequency, packet.Sender.Address, packet.Data, packet.Broadcast) , false);
}
}
}

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

@@ -26,7 +26,7 @@ namespace Content.Server.DeviceNetwork.Systems
IEntity sender = EntityManager.GetEntity(args.Sender);
IEntity receiver = EntityManager.GetEntity(uid);
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(receiver.Uid).GridID != IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(sender.Uid).GridID)
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(receiver).GridID != IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(sender).GridID)
{
args.Cancel();
}

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

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