Merge pull request #10010 from penev92/fixUAN

Fix UpgradeActorsNear revoking upgrades after the actor dies
This commit is contained in:
Oliver Brakmann
2015-11-19 18:59:42 +01:00

View File

@@ -88,7 +88,7 @@ namespace OpenRA.Mods.Common.Traits
void ActorEntered(Actor a)
{
if (a.Disposed)
if (a.Disposed || self.Disposed)
return;
if (a == self && !info.AffectsParent)
@@ -123,7 +123,7 @@ namespace OpenRA.Mods.Common.Traits
void ActorExited(Actor a)
{
if (a == self || a.Disposed)
if (a == self || a.Disposed || self.Disposed)
return;
var stance = self.Owner.Stances[a.Owner];