From 7552afeb16dd13b9fe56026d05c378d933bd1c41 Mon Sep 17 00:00:00 2001 From: Thomas Ze Date: Tue, 20 Mar 2018 23:31:20 +0100 Subject: [PATCH] Fix ActorMap.RemoveInfluenceInner see #14939 (RemoveInfluenceInner(influenceNode.Next.Next) call on influenceNode.Actor == toRemove) --- OpenRA.Mods.Common/Traits/World/ActorMap.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/World/ActorMap.cs b/OpenRA.Mods.Common/Traits/World/ActorMap.cs index 5dbe2ebbfc..8fa241cf47 100644 --- a/OpenRA.Mods.Common/Traits/World/ActorMap.cs +++ b/OpenRA.Mods.Common/Traits/World/ActorMap.cs @@ -395,11 +395,10 @@ namespace OpenRA.Mods.Common.Traits if (influenceNode == null) return; + RemoveInfluenceInner(ref influenceNode.Next, toRemove); + if (influenceNode.Actor == toRemove) influenceNode = influenceNode.Next; - - if (influenceNode != null) - RemoveInfluenceInner(ref influenceNode.Next, toRemove); } void ITick.Tick(Actor self)