Add back missing ArmsFlipped gating, previously checked into wrong br…

…anch
MegaMek · Jan 22, 2024 · 4c04b4a · 4c04b4a
1 parent 4f2ecd9
commit 4c04b4a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/megamek/src/megamek/client/ui/swing/FiringDisplay.java b/megamek/src/megamek/client/ui/swing/FiringDisplay.java
@@ -830,7 +830,7 @@ public void selectEntity(int en) {
             setTwistEnabled(!ce().getAlreadyTwisted() && ce().canChangeSecondaryFacing() && ce().getCrew().isActive());
 
             setFindClubEnabled(FindClubAction.canMechFindClub(clientgui.getClient().getGame(), en));
-            setFlipArmsEnabled(ce().canFlipArms());
+            setFlipArmsEnabled(!ce().getAlreadyTwisted() && ce().canFlipArms());
             updateSearchlight();
             updateClearTurret();
             updateClearWeaponJam();
@@ -2351,6 +2351,8 @@ void updateFlipArms(boolean armsFlipped) {
             return;
         } else if (armsFlipped == ce().getArmsFlipped()) {
             return;
+        } else if (ce().getAlreadyTwisted()) {
+            return;
         }
 
         twisting = false;

diff --git a/megamek/src/megamek/common/Entity.java b/megamek/src/megamek/common/Entity.java
@@ -1855,6 +1855,17 @@ public void setFindingClub(boolean findingClub) {
      * Set whether or not the mech's arms are flipped to the rear
      */
     public void setArmsFlipped(boolean armsFlipped) {
+        GamePhase phase = getGame().getPhase();
+        if (phase != null) {
+            // If we already twisted/flipped in an earlier phase, return out
+            if (getAlreadyTwisted()) {
+                return;
+            }
+            if (phase.isOffboard() || phase.isFiring()) {
+                // Only Offboard and Firing phases could conceivably have later phases with twisting
+                setAlreadyTwisted(true);
+            }
+        }
         setArmsFlipped(armsFlipped, true);
     }