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(); - if (res != null) - { - var plane = self.traits.Get(); - plane.UnReserve(); - plane.reservation = res.Reserve(self); - } + } + + var res = dest.traits.GetOrDefault(); + if (res != null) + { + var plane = self.traits.Get(); + 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(); - if (res != null) - reservation = res.Reserve(self); - var info = self.Info.Traits.Get(); if (self.Owner == self.World.LocalPlayer)