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

Remove gun .Owners (#14585)

Browse Source
This commit is contained in:
metalgearsloth
2023-03-11 20:08:22 +11:00
committed by GitHub
parent 19f5c403b5
commit 330bb7bb14
18 changed files with 333 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs
View File

@@ -38,7 +38,7 @@ public abstract partial class SharedGunSystem
Dirty(component);
}
UpdateBasicEntityAppearance(component);
UpdateBasicEntityAppearance(uid, component);
}
private void OnBasicEntityTakeAmmo(EntityUid uid, BasicEntityAmmoProviderComponent component, TakeAmmoEvent args)
@@ -54,10 +54,10 @@ public abstract partial class SharedGunSystem
}
var ent = Spawn(component.Proto, args.Coordinates);
args.Ammo.Add(EnsureComp<AmmoComponent>(ent));
args.Ammo.Add((ent, EnsureComp<AmmoComponent>(ent)));
}
UpdateBasicEntityAppearance(component);
UpdateBasicEntityAppearance(uid, component);
Dirty(component);
}
@@ -67,13 +67,14 @@ public abstract partial class SharedGunSystem
args.Count = component.Count ?? int.MaxValue;
}
private void UpdateBasicEntityAppearance(BasicEntityAmmoProviderComponent component)
private void UpdateBasicEntityAppearance(EntityUid uid, BasicEntityAmmoProviderComponent component)
{
if (!Timing.IsFirstTimePredicted || !TryComp<AppearanceComponent>(component.Owner, out var appearance)) return;
if (!Timing.IsFirstTimePredicted || !TryComp<AppearanceComponent>(uid, out var appearance))
return;
Appearance.SetData(appearance.Owner, AmmoVisuals.HasAmmo, component.Count != 0, appearance);
Appearance.SetData(appearance.Owner, AmmoVisuals.AmmoCount, component.Count ?? int.MaxValue, appearance);
Appearance.SetData(appearance.Owner, AmmoVisuals.AmmoMax, component.Capacity ?? int.MaxValue, appearance);
Appearance.SetData(uid, AmmoVisuals.HasAmmo, component.Count != 0, appearance);
Appearance.SetData(uid, AmmoVisuals.AmmoCount, component.Count ?? int.MaxValue, appearance);
Appearance.SetData(uid, AmmoVisuals.AmmoMax, component.Capacity ?? int.MaxValue, appearance);
}
#region Public API
@@ -88,7 +89,7 @@ public abstract partial class SharedGunSystem
component.Count = count;
Dirty(component);
UpdateBasicEntityAppearance(component);
UpdateBasicEntityAppearance(uid, component);
return true;
}