From 9ae26f26456cd2ceead523b6b22fe4d932873a0e Mon Sep 17 00:00:00 2001
From: michaeldgg2 <119738087+michaeldgg2@users.noreply.github.com>
Date: Sat, 7 Oct 2023 16:14:44 +0200
Subject: [PATCH] FireWarheads: play weapon report sound in Tick() not in
 FrameEndTask

---
 OpenRA.Mods.Common/Traits/FireWarheads.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/OpenRA.Mods.Common/Traits/FireWarheads.cs b/OpenRA.Mods.Common/Traits/FireWarheads.cs
index 8f4e13d0dd..be819967ac 100644
--- a/OpenRA.Mods.Common/Traits/FireWarheads.cs
+++ b/OpenRA.Mods.Common/Traits/FireWarheads.cs
@@ -72,11 +72,8 @@ namespace OpenRA.Mods.Common.Traits
 				foreach (var wep in Info.WeaponInfos)
 				{
 					wep.Impact(Target.FromPos(self.CenterPosition), self);
-					self.World.AddFrameEndTask(world =>
-					{
-						if (wep.Report != null && wep.Report.Length > 0)
-							Game.Sound.Play(SoundType.World, wep.Report, world, self.CenterPosition);
-					});
+					if (wep.Report != null && wep.Report.Length > 0)
+						Game.Sound.Play(SoundType.World, wep.Report, self.World, self.CenterPosition);
 				}
 			}
 		}