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

61
Content.Server/Radiation/Systems/GeigerSystem.cs
View File

@@ -32,54 +32,54 @@ public sealed class GeigerSystem : SharedGeigerSystem
SubscribeLocalEvent<RadiationSystemUpdatedEvent>(OnUpdate);
}
private void OnActivate(EntityUid uid, GeigerComponent component, ActivateInWorldEvent args)
private void OnActivate(Entity<GeigerComponent> geiger, ref ActivateInWorldEvent args)
{
if (args.Handled || component.AttachedToSuit)
if (args.Handled || geiger.Comp.AttachedToSuit)
return;
args.Handled = true;
SetEnabled(uid, component, !component.IsEnabled);
SetEnabled(geiger, !geiger.Comp.IsEnabled);
}
private void OnEquipped(EntityUid uid, GeigerComponent component, GotEquippedEvent args)
private void OnEquipped(Entity<GeigerComponent> geiger, ref GotEquippedEvent args)
{
if (component.AttachedToSuit)
SetEnabled(uid, component, true);
SetUser(component, args.Equipee);
if (geiger.Comp.AttachedToSuit)
SetEnabled(geiger, true);
SetUser(geiger, args.Equipee);
}
private void OnEquippedHand(EntityUid uid, GeigerComponent component, GotEquippedHandEvent args)
private void OnEquippedHand(Entity<GeigerComponent> geiger, ref GotEquippedHandEvent args)
{
if (component.AttachedToSuit)
if (geiger.Comp.AttachedToSuit)
return;
SetUser(component, args.User);
SetUser(geiger, args.User);
}
private void OnUnequipped(EntityUid uid, GeigerComponent component, GotUnequippedEvent args)
private void OnUnequipped(Entity<GeigerComponent> geiger, ref GotUnequippedEvent args)
{
if (component.AttachedToSuit)
SetEnabled(uid, component, false);
SetUser(component, null);
if (geiger.Comp.AttachedToSuit)
SetEnabled(geiger, false);
SetUser(geiger, null);
}
private void OnUnequippedHand(EntityUid uid, GeigerComponent component, GotUnequippedHandEvent args)
private void OnUnequippedHand(Entity<GeigerComponent> geiger, ref GotUnequippedHandEvent args)
{
if (component.AttachedToSuit)
if (geiger.Comp.AttachedToSuit)
return;
SetUser(component, null);
SetUser(geiger, null);
}
private void OnUpdate(RadiationSystemUpdatedEvent ev)
{
// update only active geiger counters
// deactivated shouldn't have rad receiver component
var query = EntityQuery<GeigerComponent, RadiationReceiverComponent>();
foreach (var (geiger, receiver) in query)
var query = EntityQueryEnumerator<GeigerComponent, RadiationReceiverComponent>();
while (query.MoveNext(out var uid, out var geiger, out var receiver))
{
var rads = receiver.CurrentRadiation;
SetCurrentRadiation(geiger.Owner, geiger, rads);
SetCurrentRadiation(uid, geiger, rads);
}
}
@@ -101,21 +101,22 @@ public sealed class GeigerSystem : SharedGeigerSystem
UpdateSound(uid, component);
}
Dirty(component);
Dirty(uid, component);
}
private void SetUser(GeigerComponent component, EntityUid? user)
private void SetUser(Entity<GeigerComponent> component, EntityUid? user)
{
if (component.User == user)
if (component.Comp.User == user)
return;
component.User = user;
component.Comp.User = user;
Dirty(component);
UpdateSound(component.Owner, component);
UpdateSound(component, component);
}
private void SetEnabled(EntityUid uid, GeigerComponent component, bool isEnabled)
private void SetEnabled(Entity<GeigerComponent> geiger, bool isEnabled)
{
var component = geiger.Comp;
if (component.IsEnabled == isEnabled)
return;
@@ -126,11 +127,11 @@ public sealed class GeigerSystem : SharedGeigerSystem
component.DangerLevel = GeigerDangerLevel.None;
}
_radiation.SetCanReceive(uid, isEnabled);
_radiation.SetCanReceive(geiger, isEnabled);
UpdateAppearance(uid, component);
UpdateSound(uid, component);
Dirty(component);
UpdateAppearance(geiger, component);
UpdateSound(geiger, component);
Dirty(geiger, component);
}
private void UpdateAppearance(EntityUid uid, GeigerComponent? component = null,