]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix Shotgun Spam Loading (#29827)
authorCojoke <83733158+Cojoke-dot@users.noreply.github.com>
Tue, 9 Jul 2024 04:23:08 +0000 (23:23 -0500)
committerGitHub <noreply@github.com>
Tue, 9 Jul 2024 04:23:08 +0000 (14:23 +1000)
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs

index 9123661c8e96928de894578729ee90b1b4df7d52..503459cefd99a624f2c697b240688b28025d96b9 100644 (file)
@@ -86,6 +86,9 @@ public abstract partial class SharedGunSystem
 
     private void OnBallisticAmmoFillDoAfter(EntityUid uid, BallisticAmmoProviderComponent component, AmmoFillDoAfterEvent args)
     {
+        if (args.Handled || args.Cancelled)
+            return;
+
         if (Deleted(args.Target) ||
             !TryComp<BallisticAmmoProviderComponent>(args.Target, out var target) ||
             target.Whitelist == null)