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

Fixes #4955 aircraft reservation crash

Browse Source 
Fixes the specific cause of the crash reported in #4955 with HeliReturn
and adds an UnReserve call while attempting to reserve spawn building in
Aircraft.cs
This commit is contained in:
Squiggles211
2014-05-22 01:34:34 -05:00
parent a040abd539
commit 0e4b1d28aa
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; return;
var res = afld.Trait<Reservable>(); var res = afld.Trait<Reservable>();
if (res != null) if (res != null)
{
UnReserve();
Reservation = res.Reserve(afld, self, this); Reservation = res.Reserve(afld, self, this);
}
} }
public void UnReserve() 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 res = dest.TraitOrDefault<Reservable>();
var heli = self.Trait<Helicopter>(); 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 exit = dest.Info.Traits.WithInterface<ExitInfo>().FirstOrDefault();
var offset = (exit != null) ? exit.SpawnOffset : WVec.Zero; var offset = (exit != null) ? exit.SpawnOffset : WVec.Zero;