Merge pull request #9786 from RoosterDragon/reserve-fixes

Reserve fixes
2015-12-01 21:13:41 +01:00
parent 035dc3fc5c b4180615a8
commit 07bfd5f59e
4 changed files with 19 additions and 40 deletions
--- a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
@@ -49,12 +49,7 @@ namespace OpenRA.Mods.Common.Activities
 			if (dest == null)
 				return;

-			var res = dest.TraitOrDefault<Reservable>();
-			if (res != null)
-			{
-				plane.UnReserve();
-				plane.Reservation = res.Reserve(dest, self, plane);
-			}
+			plane.MakeReservation(dest);

 			var landPos = dest.CenterPosition;
 			var altitude = planeInfo.CruiseAltitude.Length;