Skip to content

Commit 3de383a

Browse files
authored
BUG: Time Node Merge Not Including Controllers (#647)
* BUG: merge not including controllers * DEV: changelog
1 parent a901b45 commit 3de383a

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Attention: The newest changes should be on top -->
4040

4141
### Fixed
4242

43-
-
43+
- BUG: Time Node Merge Not Including Controllers [#647](https://github.com/RocketPy-Team/RocketPy/pull/647)
4444

4545
## [v1.4.1] - 2024-07-20
4646

rocketpy/simulation/flight.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3498,6 +3498,7 @@ def merge(self):
34983498
try:
34993499
# Try to access the node and merge if it exists
35003500
tmp_dict[time].parachutes += node.parachutes
3501+
tmp_dict[time]._controllers += node._controllers
35013502
tmp_dict[time].callbacks += node.callbacks
35023503
except KeyError:
35033504
# If the node does not exist, add it to the dictionary

0 commit comments

Comments
 (0)