From a38b072e4b0d8a4aa217ca37788d999a36bcbafe Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sun, 10 Sep 2023 22:34:26 +0200 Subject: [PATCH] Fix: don't compare next_station when trying to merge CargoPackets For vehicle packets they shouldn't be compared, and for station packets they are already in a bucket per next_station. (cherry picked from commit 1243c331b633924be1c105a9baf92dce184b1dce) --- src/cargopacket.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/cargopacket.h b/src/cargopacket.h index 650f99d4b1..3c8e96b435 100644 --- a/src/cargopacket.h +++ b/src/cargopacket.h @@ -470,7 +470,6 @@ public: { return cp1->source_xy == cp2->source_xy && cp1->periods_in_transit == cp2->periods_in_transit && - cp1->next_station == cp2->next_station && cp1->source_type == cp2->source_type && cp1->source_id == cp2->source_id; } @@ -605,7 +604,6 @@ public: { return cp1->source_xy == cp2->source_xy && cp1->periods_in_transit == cp2->periods_in_transit && - cp1->next_station == cp2->next_station && cp1->source_type == cp2->source_type && cp1->source_id == cp2->source_id; }