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

Remove Ammo component references (#19537)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-01 07:33:28 +10:00
committed by GitHub
parent df7d51ef3b
commit 3ab346f471
13 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Weapons/Ranged/Systems/GunSystem.Ballistic.cs
View File

@@ -17,13 +17,13 @@ public sealed partial class GunSystem
component.Entities.RemoveAt(component.Entities.Count - 1);
component.Container.Remove(existing);
EnsureComp<AmmoComponent>(existing);
EnsureShootable(existing);
}
else if (component.UnspawnedCount > 0)
{
component.UnspawnedCount--;
ent = Spawn(component.FillProto, coordinates);
EnsureComp<AmmoComponent>(ent.Value);
EnsureShootable(ent.Value);
}
if (ent != null)

2
Content.Server/Weapons/Ranged/Systems/GunSystem.cs
View File

@@ -283,7 +283,7 @@ public sealed partial class GunSystem : SharedGunSystem
// Do a throw
if (!HasComp<ProjectileComponent>(uid))
{
RemComp<AmmoComponent>(uid);
RemoveShootable(uid);
// TODO: Someone can probably yeet this a billion miles so need to pre-validate input somewhere up the call stack.
ThrowingSystem.TryThrow(uid, mapDirection, gun.ProjectileSpeed, user);
return;