Index: binaries/data/mods/public/simulation/components/Attack.js
===================================================================
--- binaries/data/mods/public/simulation/components/Attack.js
+++ binaries/data/mods/public/simulation/components/Attack.js
@@ -720,27 +720,13 @@
 Attack.prototype.IsTargetInRange = function(target, type)
 {
 	let range = this.GetRange(type);
-	if (type == "Ranged")
-	{
-		let cmpPositionTarget = Engine.QueryInterface(target, IID_Position);
-		if (!cmpPositionTarget || !cmpPositionTarget.IsInWorld())
-			return false;
-
-		let cmpPositionSelf = Engine.QueryInterface(this.entity, IID_Position);
-		if (!cmpPositionSelf || !cmpPositionSelf.IsInWorld())
-			return false;
-
-		let positionSelf = cmpPositionSelf.GetPosition();
-		let positionTarget = cmpPositionTarget.GetPosition();
-
-		let heightDifference = positionSelf.y + range.elevationBonus - positionTarget.y;
-		range.max = Math.sqrt(Math.square(range.max) + 2 * range.max * heightDifference);
-
-		if (range.max < 0)
-			return false;
-	}
-	let cmpObstructionManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_ObstructionManager);
-	return cmpObstructionManager.IsInTargetRange(this.entity, target, range.min, range.max, false);
+	let parabolicMaxRange = Math.max(0, Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager).GetEffectiveParabolicRange(this.entity, target, range.max, range.elevationBonus));
+	return parabolicMaxRange >= 0 && Engine.QueryInterface(SYSTEM_ENTITY, IID_ObstructionManager).IsInTargetRange(
+		this.entity,
+		target,
+		range.min,
+		parabolicMaxRange,
+		false);
 };
 
 Attack.prototype.OnValueModification = function(msg)
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
@@ -4695,25 +4695,8 @@
 	if (!range)
 		return false;
 
-	let thisCmpPosition = Engine.QueryInterface(this.entity, IID_Position);
-	if (!thisCmpPosition.IsInWorld())
-		return false;
-	let s = thisCmpPosition.GetPosition();
-
-	let targetCmpPosition = Engine.QueryInterface(target, IID_Position);
-	if (!targetCmpPosition || !targetCmpPosition.IsInWorld())
-		return false;
-
-	// Parabolic range compuation is the same as in BuildingAI's FireArrows.
-	let t = targetCmpPosition.GetPosition();
-	// h is positive when I'm higher than the target
-	let h = s.y - t.y + range.elevationBonus;
-
-	let parabolicMaxRange = Math.sqrt(Math.square(range.max) + 2 * range.max * h);
-	// No negative roots please
-	if (h <= -range.max / 2)
-		// return false? Or hope you come close enough?
-		parabolicMaxRange = 0;
+	// In case the range returns negative, we are probably too high compared to the target. Hope we come close enough.
+	let parabolicMaxRange = Math.max(0, Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager).GetEffectiveParabolicRange(this.entity, target, range.max, range.elevationBonus));
 
 	// The parabole changes while walking so be cautious:
 	let guessedMaxRange = parabolicMaxRange > range.max ? (range.max + parabolicMaxRange) / 2 : parabolicMaxRange;
Index: source/simulation2/components/CCmpRangeManager.cpp
===================================================================
--- source/simulation2/components/CCmpRangeManager.cpp
+++ source/simulation2/components/CCmpRangeManager.cpp
@@ -1279,6 +1279,23 @@
 		}
 	}
 
+	virtual entity_pos_t GetEffectiveParabolicRange(entity_id_t source, entity_id_t target, entity_pos_t range, entity_pos_t elevationBonus) const
+	{
+		CmpPtr<ICmpPosition> cmpSourcePosition(GetSimContext(), source);
+		if (!cmpSourcePosition || !cmpSourcePosition->IsInWorld())
+			return entity_pos_t::FromInt(-1);
+
+		CmpPtr<ICmpPosition> cmpTargetPosition(GetSimContext(), target);
+		if (!cmpTargetPosition || !cmpTargetPosition->IsInWorld())
+			return entity_pos_t::FromInt(-1);
+
+		entity_pos_t h = cmpSourcePosition->GetHeightOffset() - cmpTargetPosition->GetHeightOffset() + elevationBonus;
+		if (h < -range / 2)
+			return entity_pos_t::FromInt(-1);
+
+		return (range.Square() + range.Multiply(h).Multiply(entity_pos_t::FromInt(2))).Sqrt();
+	}
+
 	virtual entity_pos_t GetElevationAdaptedRange(const CFixedVector3D& pos1, const CFixedVector3D& rot, entity_pos_t range, entity_pos_t elevationBonus, entity_pos_t angle) const
 	{
 		entity_pos_t r = entity_pos_t::Zero();
Index: source/simulation2/components/ICmpRangeManager.h
===================================================================
--- source/simulation2/components/ICmpRangeManager.h
+++ source/simulation2/components/ICmpRangeManager.h
@@ -169,6 +169,15 @@
 
 
 	/**
+	 * Get the effective range in a parablic range query.
+	 * @param source The entity id at the origin of the query.
+	 * @param target A target entity id.
+	 * @param range The distance to compare terrain height with.
+	 * @param elevationBonus Height the source gains over the target by default.
+	 */
+	virtual entity_pos_t GetEffectiveParabolicRange(entity_id_t source, entity_id_t target, entity_pos_t range, entity_pos_t elevationBonus) const = 0;
+
+	/**
 	 * Get the average elevation over 8 points on distance range around the entity
 	 * @param id the entity id to look around
 	 * @param range the distance to compare terrain height with
Index: source/simulation2/components/ICmpRangeManager.cpp
===================================================================
--- source/simulation2/components/ICmpRangeManager.cpp
+++ source/simulation2/components/ICmpRangeManager.cpp
@@ -64,6 +64,7 @@
 DEFINE_INTERFACE_METHOD("ExploreTerritories", ICmpRangeManager, ExploreTerritories)
 DEFINE_INTERFACE_METHOD("SetLosRevealAll", ICmpRangeManager, SetLosRevealAll)
 DEFINE_INTERFACE_METHOD("GetLosRevealAll", ICmpRangeManager, GetLosRevealAll)
+DEFINE_INTERFACE_METHOD("GetEffectiveParabolicRange", ICmpRangeManager, GetEffectiveParabolicRange)
 DEFINE_INTERFACE_METHOD("GetElevationAdaptedRange", ICmpRangeManager, GetElevationAdaptedRange)
 DEFINE_INTERFACE_METHOD("ActivateScriptedVisibility", ICmpRangeManager, ActivateScriptedVisibility)
 DEFINE_INTERFACE_METHOD("GetLosVisibility", ICmpRangeManager, GetLosVisibility_wrapper)