From 760cab26325d050fe10623d4bafa02dc5aa406ea Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Mon, 28 Dec 2020 01:00:01 +0000
Subject: [PATCH] Partial fix for
 https://github.com/OpenTTD/OpenTTD/issues/8437

(Part 2: helicopter landings)
---
 src/aircraft_cmd.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 9413a1898d..e670b33aaa 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -963,6 +963,12 @@ static bool AircraftController(Aircraft *v)
 			return false;
 		}
 
+		if (st->airport.type != AT_OILRIG) {
+			x = v->x_pos;
+			y = v->y_pos;
+			tile = TileVirtXY(x, y);
+		}
+
 		/* Vehicle is now at the airport. */
 		v->tile = tile;