Containers: bug fix for http://www.elvastower.com/forums/index.php?/topic/36316-odd-consist-bug/page__view__findpost__p__286076

Csantucci · Csantucci · commit 0bc1d9cb5259 · 2022-06-07T22:38:50.000+02:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
@@ -254,7 +254,8 @@ public FreightAnimations(FreightAnimations copyFACollection, MSTSWagon wagon)
             LoadingAreaLength = copyFACollection.LoadingAreaLength;
             AboveLoadingAreaLength = copyFACollection.AboveLoadingAreaLength;
             Offset = copyFACollection.Offset;
-            GeneralIntakePoint = new IntakePoint(copyFACollection.GeneralIntakePoint);
+            if (copyFACollection.GeneralIntakePoint != null)
+                GeneralIntakePoint = new IntakePoint(copyFACollection.GeneralIntakePoint);
             DoubleStacker = copyFACollection.DoubleStacker;
             if (copyFACollection.LoadDataList?.Count >= 0)
             {
@@ -320,6 +321,8 @@ public void Load(MSTSWagon wagon, string loadFilePath, LoadPosition loadPosition
 
         public void Load(MSTSWagon wagon, List<LoadData> loadDataList, bool listInWagFile = false)
         {
+            if (GeneralIntakePoint == null)
+                return;
             if (loadDataList != null && loadDataList.Count != 0)
             {
                 foreach (var loadData in loadDataList)

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,8 @@ public FreightAnimations(FreightAnimations copyFACollection, MSTSWagon wagon)`
`254`	`254`	`LoadingAreaLength = copyFACollection.LoadingAreaLength;`
`255`	`255`	`AboveLoadingAreaLength = copyFACollection.AboveLoadingAreaLength;`
`256`	`256`	`Offset = copyFACollection.Offset;`
`257`		`- GeneralIntakePoint = new IntakePoint(copyFACollection.GeneralIntakePoint);`
	`257`	`+ if (copyFACollection.GeneralIntakePoint != null)`
	`258`	`+ GeneralIntakePoint = new IntakePoint(copyFACollection.GeneralIntakePoint);`
`258`	`259`	`DoubleStacker = copyFACollection.DoubleStacker;`
`259`	`260`	`if (copyFACollection.LoadDataList?.Count >= 0)`
`260`	`261`	`{`
`@@ -320,6 +321,8 @@ public void Load(MSTSWagon wagon, string loadFilePath, LoadPosition loadPosition`
`320`	`321`
`321`	`322`	`public void Load(MSTSWagon wagon, List<LoadData> loadDataList, bool listInWagFile = false)`
`322`	`323`	`{`
	`324`	`+ if (GeneralIntakePoint == null)`
	`325`	`+ return;`
`323`	`326`	`if (loadDataList != null && loadDataList.Count != 0)`
`324`	`327`	`{`
`325`	`328`	`foreach (var loadData in loadDataList)`