Skip to content

Commit

Permalink
Merge pull request #4705 from NickAragua/fix_sim_fire_skip_unit
Browse files Browse the repository at this point in the history
reset 'turn interrupted' flag between phases
  • Loading branch information
HammerGS authored Aug 14, 2023
2 parents 4cbba4d + 0216636 commit 75690a9
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions megamek/src/megamek/server/GameManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,9 @@ private void resetEntityPhase(GamePhase phase) {
entity.setUsedSearchlight(false);
entity.setCarefulStand(false);
entity.setNetworkBAP(false);

// this flag is relevant only within the context of a single phase, but not between phases
entity.setTurnInterrupted(false);

if (entity instanceof MechWarrior) {
((MechWarrior) entity).setLanded(true);
Expand Down

0 comments on commit 75690a9

Please sign in to comment.