Merge branch 'release/42.6.3'

alaingilbert · Dec 9, 2020 · e466844 · e466844
2 parents bf33724 + d29d6c2
commit e466844
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/fleetBuilder.go b/fleetBuilder.go
@@ -182,11 +182,7 @@ func (f *FleetBuilder) FlightTime() (secs, fuel int64) {
 			ships, _ = f.b.GetShips(f.origin.GetID())
 		}
 	}
-	secs, fuel = f.b.FlightTime(f.origin.GetCoordinate(), f.destination, f.speed, ships)
-	if (f.mission == Expedition || f.mission == ParkInThatAlly) && f.holdingTime > 0 {
-		secs += f.holdingTime * 3600
-	}
-	return
+	return f.b.FlightTime(f.origin.GetCoordinate(), f.destination, f.speed, ships)
 }
 
 func (f *FleetBuilder) sendNow(tx Prioritizable) error {