From a172d1a7aab10029692de36305ca4781207fea90 Mon Sep 17 00:00:00 2001 From: ZuoRen Chen Date: Sat, 21 Feb 2026 23:23:26 +0000 Subject: [PATCH 1/2] Fix: Duplicate merge of _controllers in Flight.TimeNodes.merge() --- rocketpy/simulation/flight.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rocketpy/simulation/flight.py b/rocketpy/simulation/flight.py index a081e656d..25ea9f2e3 100644 --- a/rocketpy/simulation/flight.py +++ b/rocketpy/simulation/flight.py @@ -4589,7 +4589,6 @@ def merge(self): tmp_dict[time]._controllers += node._controllers tmp_dict[time].callbacks += node.callbacks tmp_dict[time]._component_sensors += node._component_sensors - tmp_dict[time]._controllers += node._controllers except KeyError: # If the node does not exist, add it to the dictionary tmp_dict[time] = node From 38a808a491815a4210bb8c2a37096d859fe4788a Mon Sep 17 00:00:00 2001 From: ZuoRen Chen Date: Sat, 28 Feb 2026 00:37:34 +0000 Subject: [PATCH 2/2] BUG: Fix duplicate controllers in Flight.TimeNodes.merge() Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61d01a191..d85ddb110 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,7 +59,7 @@ Attention: The newest changes should be on top --> - BUG: energy_data plot not working for 3 dof sims [[#906](https://github.com/RocketPy-Team/RocketPy/issues/906)] - BUG: Fix CSV column header spacing in FlightDataExporter [#864](https://github.com/RocketPy-Team/RocketPy/issues/864) - BUG: Fix parallel Monte Carlo simulation showing incorrect iteration count [#806](https://github.com/RocketPy-Team/RocketPy/pull/806) - +- BUG: Duplicate _controllers in Flight.TimeNodes.merge() [#931](https://github.com/RocketPy-Team/RocketPy/pull/931) ## [v1.11.0] - 2025-11-01