epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5390 from Squiggles211/hpad_reserved

Browse Source 
Fixes #4955 aircraft reservation crash
This commit is contained in:
Matthias Mailänder
2014-05-22 09:50:08 +02:00
parent 7fad385d8c 0e4b1d28aa
commit 6081a4f16b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Air/Aircraft.cs
View File

@@ -80,8 +80,12 @@ namespace OpenRA.Mods.RA.Air
return;
var res = afld.Trait<Reservable>();
if (res != null)
{
UnReserve();
Reservation = res.Reserve(afld, self, this);
}
}
public void UnReserve()

7
OpenRA.Mods.RA/Air/HeliReturn.cs
View File

@@ -47,9 +47,12 @@ namespace OpenRA.Mods.RA.Air
var res = dest.TraitOrDefault<Reservable>();
var heli = self.Trait<Helicopter>();
if (res != null)
heli.Reservation = res.Reserve(dest, self, heli);
if (res != null)
{
heli.UnReserve();
heli.Reservation = res.Reserve(dest, self, heli);
}
var exit = dest.Info.Traits.WithInterface<ExitInfo>().FirstOrDefault();
var offset = (exit != null) ? exit.SpawnOffset : WVec.Zero;