tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove 700 usages of Component.Owner (#21100)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-19 12:34:31 -07:00
committed by GitHub
parent 5825ffb95c
commit f560f88eb5
261 changed files with 2291 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
View File

@@ -73,35 +73,35 @@ namespace Content.Server.Power.EntitySystems
component.LinkedReceivers.Clear();
}
private void OnProviderConnected(EntityUid uid, ApcPowerReceiverComponent receiver, ExtensionCableSystem.ProviderConnectedEvent args)
private void OnProviderConnected(Entity<ApcPowerReceiverComponent> receiver, ref ExtensionCableSystem.ProviderConnectedEvent args)
{
var providerUid = args.Provider.Owner;
if (!EntityManager.TryGetComponent<ApcPowerProviderComponent>(providerUid, out var provider))
return;
receiver.Provider = provider;
receiver.Comp.Provider = provider;
ProviderChanged(receiver);
}
private void OnProviderDisconnected(EntityUid uid, ApcPowerReceiverComponent receiver, ExtensionCableSystem.ProviderDisconnectedEvent args)
private void OnProviderDisconnected(Entity<ApcPowerReceiverComponent> receiver, ref ExtensionCableSystem.ProviderDisconnectedEvent args)
{
receiver.Provider = null;
receiver.Comp.Provider = null;
ProviderChanged(receiver);
}
private void OnReceiverConnected(EntityUid uid, ApcPowerProviderComponent provider, ExtensionCableSystem.ReceiverConnectedEvent args)
private void OnReceiverConnected(Entity<ApcPowerProviderComponent> provider, ref ExtensionCableSystem.ReceiverConnectedEvent args)
{
if (EntityManager.TryGetComponent(args.Receiver.Owner, out ApcPowerReceiverComponent? receiver))
if (EntityManager.TryGetComponent(args.Receiver, out ApcPowerReceiverComponent? receiver))
{
provider.AddReceiver(receiver);
provider.Comp.AddReceiver(receiver);
}
}
private void OnReceiverDisconnected(EntityUid uid, ApcPowerProviderComponent provider, ExtensionCableSystem.ReceiverDisconnectedEvent args)
{
if (EntityManager.TryGetComponent(args.Receiver.Owner, out ApcPowerReceiverComponent? receiver))
if (EntityManager.TryGetComponent(args.Receiver, out ApcPowerReceiverComponent? receiver))
{
provider.RemoveReceiver(receiver);
}
@@ -134,13 +134,14 @@ namespace Content.Server.Power.EntitySystems
args.Verbs.Add(verb);
}
private void ProviderChanged(ApcPowerReceiverComponent receiver)
private void ProviderChanged(Entity<ApcPowerReceiverComponent> receiver)
{
receiver.NetworkLoad.LinkedNetwork = default;
var ev = new PowerChangedEvent(receiver.Powered, receiver.NetworkLoad.ReceivingPower);
var comp = receiver.Comp;
comp.NetworkLoad.LinkedNetwork = default;
var ev = new PowerChangedEvent(comp.Powered, comp.NetworkLoad.ReceivingPower);
RaiseLocalEvent(receiver.Owner, ref ev);
_appearance.SetData(receiver.Owner, PowerDeviceVisuals.Powered, receiver.Powered);
RaiseLocalEvent(receiver, ref ev);
_appearance.SetData(receiver, PowerDeviceVisuals.Powered, comp.Powered);
}
/// <summary>