Index: binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/UnitAI.js
+++ binaries/data/mods/public/simulation/components/UnitAI.js
@@ -1796,7 +1796,13 @@
 					}
 
 					if (!this.CheckTargetAttackRange(this.order.data.target, this.order.data.attackType))
+					{
+						// Try moving again,
+						// attack range uses a height-related formula and our actual max range might have changed.
+						if (!this.MoveToTargetAttackRange(this.order.data.target, this.order.data.attackType))
+							this.FinishOrder();
 						return;
+					}
 
 					// If the unit needs to unpack, do so
 					if (this.CanUnpack())