From aafbeed703a62a9a4abc631867cd5954580df92c Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 1 Aug 2010 14:36:53 +1200
Subject: [PATCH] ffs, doing it the hard way as usual

---
 OpenRA.Mods.RA/Activities/ReturnToBase.cs | 15 ++++++++-------
 OpenRA.Mods.RA/Plane.cs                   |  4 ----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/OpenRA.Mods.RA/Activities/ReturnToBase.cs b/OpenRA.Mods.RA/Activities/ReturnToBase.cs
index 28ebc08b70..fde8c44ef7 100644
--- a/OpenRA.Mods.RA/Activities/ReturnToBase.cs
+++ b/OpenRA.Mods.RA/Activities/ReturnToBase.cs
@@ -38,13 +38,14 @@ namespace OpenRA.Mods.RA.Activities
 			if (dest == null)
 			{
 				dest = ChooseAirfield(self);
-				var res = dest.traits.GetOrDefault<Reservable>();
-				if (res != null)
-				{
-					var plane = self.traits.Get<Plane>();
-					plane.UnReserve();
-					plane.reservation = res.Reserve(self);
-				}
+			}
+
+			var res = dest.traits.GetOrDefault<Reservable>();
+			if (res != null)
+			{
+				var plane = self.traits.Get<Plane>();
+				plane.UnReserve();
+				plane.reservation = res.Reserve(self);
 			}
 
 			var landPos = dest.CenterLocation;
diff --git a/OpenRA.Mods.RA/Plane.cs b/OpenRA.Mods.RA/Plane.cs
index cb4deb6ee5..57fae52ecd 100644
--- a/OpenRA.Mods.RA/Plane.cs
+++ b/OpenRA.Mods.RA/Plane.cs
@@ -108,10 +108,6 @@ namespace OpenRA.Mods.RA
 
 				UnReserve();
 
-				var res = order.TargetActor.traits.GetOrDefault<Reservable>();
-				if (res != null)
-					reservation = res.Reserve(self);
-
 				var info = self.Info.Traits.Get<PlaneInfo>();
 
 				if (self.Owner == self.World.LocalPlayer)