Revert cachedLocation change that caused issues with transports.
This partially reverts commit 2f5ac1a360.
This commit is contained in:
@@ -36,10 +36,10 @@ namespace OpenRA.Mods.RA
|
||||
readonly List<Actor> cargo = new List<Actor>();
|
||||
readonly HashSet<Actor> reserves = new HashSet<Actor>();
|
||||
|
||||
CPos cachedLocation;
|
||||
int totalWeight = 0;
|
||||
int reservedWeight = 0;
|
||||
|
||||
CPos currentCell;
|
||||
public IEnumerable<CPos> CurrentAdjacentCells { get; private set; }
|
||||
public bool Unloading { get; internal set; }
|
||||
public IEnumerable<Actor> Passengers { get { return cargo; } }
|
||||
@@ -269,7 +269,7 @@ namespace OpenRA.Mods.RA
|
||||
public void AddedToWorld(Actor self)
|
||||
{
|
||||
// Force location update to avoid issues when initial spawn is outside map
|
||||
cachedLocation = self.Location;
|
||||
currentCell = self.Location;
|
||||
CurrentAdjacentCells = GetAdjacentCells();
|
||||
}
|
||||
|
||||
@@ -286,13 +286,13 @@ namespace OpenRA.Mods.RA
|
||||
foreach (var npe in self.TraitsImplementing<INotifyPassengerEntered>())
|
||||
npe.PassengerEntered(self, c);
|
||||
}
|
||||
|
||||
initialized = true;
|
||||
}
|
||||
|
||||
if (cachedLocation != self.Location)
|
||||
var cell = self.World.Map.CellContaining(self.CenterPosition);
|
||||
if (currentCell != cell)
|
||||
{
|
||||
cachedLocation = self.Location;
|
||||
currentCell = cell;
|
||||
CurrentAdjacentCells = GetAdjacentCells();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user