Merge pull request #11670 from evgeniysergeev/sandworm

Check that noiseDirection is not a zero
2016-08-12 13:45:14 +02:00
parent 068ffb169b e824a4afbd
commit 9604bf4cbd
1 changed files with 7 additions and 0 deletions
--- a/OpenRA.Mods.D2k/Traits/Sandworm.cs
+++ b/OpenRA.Mods.D2k/Traits/Sandworm.cs
@@ -111,6 +111,13 @@ namespace OpenRA.Mods.D2k.Traits

 			while (!self.World.Map.Contains(moveTo) || !mobile.CanEnterCell(moveTo, null, false))
 			{
+				// without this check, this while can be infinity loop
+				if (moveTo == self.Location)
+				{
+					self.CancelActivity();
+					return;
+				}
+
 				noiseDirection /= 2;
 				moveTo = self.World.Map.CellContaining(self.CenterPosition + noiseDirection);
 			}