Reset Locomotor cache on world loaded

OpenRA · Aug 10, 2019 · fbdd96f · fbdd96f
1 parent 172c4c6
commit fbdd96f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/OpenRA.Mods.Common/Traits/Mobile.cs b/OpenRA.Mods.Common/Traits/Mobile.cs
@@ -71,6 +71,9 @@ public override void RulesetLoaded(Ruleset rules, ActorInfo ai)
 			else if (locomotorInfos.Count(li => li.Name == Locomotor) > 1)
 				throw new YamlException("There is more than one locomotor named '{0}'.".F(Locomotor));
 
+			// We need to reset the reset the reference to the locomotor between each worlds, otherwise we are reference the previous state.
+			locomotor = null;
+
 			base.RulesetLoaded(rules, ai);
 		}
 

diff --git a/OpenRA.Mods.Common/Traits/World/Locomotor.cs b/OpenRA.Mods.Common/Traits/World/Locomotor.cs
@@ -380,7 +380,6 @@ public void WorldLoaded(World w, WorldRenderer wr)
 			blockingCache = new CellLayer<CellCache>(map);
 			cellsCost = new CellLayer<short>(map);
 
-
 			terrainInfos = Info.TilesetTerrainInfo[map.Rules.TileSet];
 
 			foreach (var cell in map.AllCells)