Fix on previous fix. Now siding check is done on wagons dropped. And amount of wagos dropped has to be exactly the amount on the activity asked list.

Author: sweiland-openrails

Source/Orts.Simulation/Simulation/Activity.cs

@@ -1324,13 +1324,13 @@ override public Boolean Triggered(Activity activity)
                     }
                     break;
                 case EventType.DropOffWagonsAtLocation:
-                    // Dropping off of wagons should only count once disconnected from player train.
-                    // A better name than DropOffWagonsAtLocation would be ArriveAtSidingWithWagons.
-                    // To recognize the dropping off of the cars before the event is activated, this method is used.
-                    if (atSiding(OriginalPlayerTrain.FrontTDBTraveller, OriginalPlayerTrain.RearTDBTraveller, this.SidingEnd1, this.SidingEnd2))
+                    consistTrain = matchesConsistNoOrder(ChangeWagonIdList);
+                    if (consistTrain != null)
                     {
-                        consistTrain = matchesConsistNoOrder(ChangeWagonIdList);
-                        triggered = consistTrain != null;
+                        if (atSiding(consistTrain.FrontTDBTraveller, consistTrain.RearTDBTraveller, this.SidingEnd1, this.SidingEnd2))
+                        {
+                            triggered = true;
+                        }
                     }
                     break;
                 case EventType.PickUpPassengers:
@@ -1391,10 +1391,10 @@ private Train matchesConsistNoOrder(List<string> wagonIdList)
                     {
                         nWagonListCars++;
                     }
-                    if (nWagonListCars == trainItem.Cars.Count)
-                    {
-                        return trainItem;
-                    }
+                }
+                if (nWagonListCars == trainItem.Cars.Count)
+                {
+                    return trainItem;
                 }
             }