Skip to content

Commit 8cdb69f

Browse files
authored
BUG: Duplicate _controllers in Flight.TimeNodes.merge() (#931)
* Fix: Duplicate merge of _controllers in Flight.TimeNodes.merge() * BUG: Fix duplicate controllers in Flight.TimeNodes.merge() Update changelog --------- Co-authored-by: ZuoRen Chen <zuorenchen@outlook.com>
1 parent 10457f9 commit 8cdb69f

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Attention: The newest changes should be on top -->
5959
- BUG: energy_data plot not working for 3 dof sims [[#906](https://github.com/RocketPy-Team/RocketPy/issues/906)]
6060
- BUG: Fix CSV column header spacing in FlightDataExporter [#864](https://github.com/RocketPy-Team/RocketPy/issues/864)
6161
- BUG: Fix parallel Monte Carlo simulation showing incorrect iteration count [#806](https://github.com/RocketPy-Team/RocketPy/pull/806)
62-
62+
- BUG: Duplicate _controllers in Flight.TimeNodes.merge() [#931](https://github.com/RocketPy-Team/RocketPy/pull/931)
6363

6464
## [v1.11.0] - 2025-11-01
6565

rocketpy/simulation/flight.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4589,7 +4589,6 @@ def merge(self):
45894589
tmp_dict[time]._controllers += node._controllers
45904590
tmp_dict[time].callbacks += node.callbacks
45914591
tmp_dict[time]._component_sensors += node._component_sensors
4592-
tmp_dict[time]._controllers += node._controllers
45934592
except KeyError:
45944593
# If the node does not exist, add it to the dictionary
45954594
tmp_dict[time] = node

0 commit comments

Comments
 (0)