From 46a728826b46932d9353b417bb60635b998512e0 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Wed, 4 Nov 2015 21:27:18 +0100
Subject: [PATCH] Fix spice debris target cell randomization

---
 OpenRA.Mods.D2k/Traits/SpiceBloom.cs | 31 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/OpenRA.Mods.D2k/Traits/SpiceBloom.cs b/OpenRA.Mods.D2k/Traits/SpiceBloom.cs
index aec763cc9d..001964fcd4 100644
--- a/OpenRA.Mods.D2k/Traits/SpiceBloom.cs
+++ b/OpenRA.Mods.D2k/Traits/SpiceBloom.cs
@@ -91,21 +91,6 @@ namespace OpenRA.Mods.D2k.Traits
 
 		public void Killed(Actor self, AttackInfo e)
 		{
-			var args = new ProjectileArgs
-			{
-				Weapon = self.World.Map.Rules.Weapons[info.Weapon.ToLowerInvariant()],
-				Facing = 0,
-
-				DamageModifiers = self.TraitsImplementing<IFirepowerModifier>()
-					.Select(a => a.GetFirepowerModifier()).ToArray(),
-
-				InaccuracyModifiers = self.TraitsImplementing<IInaccuracyModifier>()
-					.Select(a => a.GetInaccuracyModifier()).ToArray(),
-
-				Source = self.CenterPosition,
-				SourceActor = self,
-			};
-
 			var pieces = self.World.SharedRandom.Next(info.Pieces[0], info.Pieces[1]) * ticks / growTicks;
 			for (var i = 0; pieces > i; i++)
 			{
@@ -114,7 +99,21 @@ namespace OpenRA.Mods.D2k.Traits
 				if (cell == null)
 					cell = cells.Take(info.Range).Random(self.World.SharedRandom);
 
-				args.PassiveTarget = self.World.Map.CenterOfCell(cell.Value);
+				var args = new ProjectileArgs
+				{
+					Weapon = self.World.Map.Rules.Weapons[info.Weapon.ToLowerInvariant()],
+					Facing = 0,
+
+					DamageModifiers = self.TraitsImplementing<IFirepowerModifier>()
+						.Select(a => a.GetFirepowerModifier()).ToArray(),
+
+					InaccuracyModifiers = self.TraitsImplementing<IInaccuracyModifier>()
+						.Select(a => a.GetInaccuracyModifier()).ToArray(),
+
+					Source = self.CenterPosition,
+					SourceActor = self,
+					PassiveTarget = self.World.Map.CenterOfCell(cell.Value)
+				};
 
 				self.World.AddFrameEndTask(_ =>
 				{