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

8
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
View File

@@ -342,13 +342,13 @@ public partial class SharedGunSystem
component.Chambers[index] = false;
SetCartridgeSpent(ent, cartridge, true);
var spawned = Spawn(cartridge.Prototype, args.Coordinates);
args.Ammo.Add((spawned, EnsureComp<AmmoComponent>(spawned)));
args.Ammo.Add((spawned, EnsureShootable(spawned)));
Del(ent);
continue;
}
component.Chambers[i] = null;
args.Ammo.Add((ent, EnsureComp<AmmoComponent>(ent)));
args.Ammo.Add((ent, EnsureShootable(ent)));
}
}
else if (component.AmmoSlots[index] != null)
@@ -362,13 +362,13 @@ public partial class SharedGunSystem
SetCartridgeSpent(ent.Value, cartridge, true);
var spawned = Spawn(cartridge.Prototype, args.Coordinates);
args.Ammo.Add((spawned, EnsureComp<AmmoComponent>(spawned)));
args.Ammo.Add((spawned, EnsureShootable(spawned)));
continue;
}
component.AmmoContainer.Remove(ent.Value);
component.AmmoSlots[index] = null;
args.Ammo.Add((ent.Value, EnsureComp<AmmoComponent>(ent.Value)));
args.Ammo.Add((ent.Value, EnsureShootable(ent.Value)));
TransformSystem.SetCoordinates(ent.Value, args.Coordinates);
}
}