a

Author: Yuta12342

source/games/uno/HandSwapSubstate.hx

@@ -429,10 +429,12 @@ class HandSwapSubstate extends MusicBeatSubstate {
         });
         shouldBeClosed = true;
         close();
+        meantToClose = true;
     }
+    var meantToClose:Bool = false;
 
     private function selectPlayer(index:Int):Void {
-        if (!animationComplete || index < 0 || index >= availablePlayers.length) return;
+        if (!animationComplete || index < 0 || index >= availablePlayers.length || meantToClose) return;
 
         try {
             var selectedPlayer = availablePlayers[index];

source/games/uno/UnoTestState.hx

@@ -390,8 +390,9 @@ class UnoTestState extends MusicBeatState {
 
                 // Open the hand swap substate for player selection
                 var handSwapSubstate = new HandSwapSubstate(currentPlayer, availablePlayers, function(selectedPlayer:UnoPlayer) {
-                    // Reset waiting flag first
-                    waitingForHandSwap = false;
+                    try {
+                        // Reset waiting flag first
+                        waitingForHandSwap = false;
 
                     // Perform the actual hand swap through the rules system
                     if (performHandSwap != null)
@@ -408,6 +409,7 @@ class UnoTestState extends MusicBeatState {
                     performHandSwap = null;
                     unoGame.onSevenRuleHandSwap = null; // Clear the handler to prevent reuse
                     return;
+                }
                 }, function(selectedPlayer:UnoPlayer) {
                     // Reset waiting flag first
                     waitingForHandSwap = false;
@@ -1288,7 +1290,7 @@ class UnoTestState extends MusicBeatState {
         }
         isPlayingCard = false;
         resetCardSelection();
-    }    private function updateInstructionText(text:String, ?doFade:Bool = false):Void {
+    }       private function updateInstructionText(text:String, ?doFade:Bool = false):Void {
         var originalText = instructionText.text;
         if (instructionText != null) {
             instructionText.text = text;
@@ -1328,6 +1330,14 @@ class UnoTestState extends MusicBeatState {
     override function update(elapsed:Float) {
         super.update(elapsed);
 
+        // Safety check: Reset stuck hand swap flag after 10 seconds
+        if (waitingForHandSwap && haxe.Timer.stamp() - lastHandSwapTime > 10.0 && subState == null) {
+            trace("Hand swap taking too long, resetting flags");
+            waitingForHandSwap = false;
+            UnoRules.resetHandSwapFlag();
+            updateInstructionText("Hand swap timeout - continuing game", true);
+        }
+
         // Handle CPU turns
         if (unoGame != null && unoGame.turnManager != null && unoGame.turnManager.getCurrentPlayer() != null) {
             var currentPlayer = unoGame.turnManager.getCurrentPlayer();

source/games/uno/backend/UnoGame.hx

@@ -138,6 +138,8 @@ class UnoGame {
         roundNumber++;
         isRoundActive = true;
         drawStack = 0;
+        handSwapProcessed = false; // Reset hand swap flag for new round
+        UnoRules.resetHandSwapFlag(); // Reset static flag as well
 
         // Reset deck and hands
         deck.reset(customColors, customCards);
@@ -244,8 +246,7 @@ class UnoGame {
         // After eveything is done
         afterCardPlayed(player, playedCard);
 
-        // Next turn
-        handSwapProcessed = false; // Reset for next turn
+        // Next turn (handSwapProcessed will be reset when turn actually starts)
         turnManager.nextTurn();
         updateGameState();
 

source/games/uno/backend/UnoRules.hx

@@ -157,6 +157,9 @@ class UnoRules {
                (playerCard.type != NUMBER || playerCard.value == topCard.value);
     }
 
+    // Static flag to prevent multiple simultaneous hand swaps
+    private static var handSwapInProgress:Bool = false;
+
     /**
      * Apply seven-zero rule effects
      */
@@ -165,7 +168,8 @@ class UnoRules {
 
         if (card.value == 7) {
             // Player who played 7 swaps hands with another player of their choice
-            if (onSevenRuleHandSwap != null) {
+            if (onSevenRuleHandSwap != null && !handSwapInProgress) {
+                handSwapInProgress = true; // Set flag to prevent concurrent swaps
                 var currentPlayer = players[currentPlayerIndex];
                 var availablePlayers = players.filter(p -> p != currentPlayer);
 
@@ -190,6 +194,9 @@ class UnoRules {
                     } else {
                         trace('Hand swap cancelled or invalid selection');
                     }
+                    
+                    // Always reset the flag when swap is complete (or cancelled)
+                    handSwapInProgress = false;
                 };
 
                 // Call the UI callback with our swap function
@@ -210,6 +217,13 @@ class UnoRules {
         }
     }
 
+    /**
+     * Reset hand swap progress flag (for recovery from errors)
+     */
+    public static function resetHandSwapFlag():Void {
+        handSwapInProgress = false;
+    }
+
     /**
      * Check if card being played is a +2 during a stack (Allows any color for any plus stack)
      */