Merge branch 'AP-CustomEx' of https://github.com/Z11Coding/Mixtape-Engine-Rework into AP-CustomEx

Author: Yuta12342

source/games/uno/UnoTestState.hx

@@ -796,50 +796,46 @@ class UnoTestState extends MusicBeatState {
             return;
         }
 
-        try {
-            var currentPlayer = unoGame.turnManager.getCurrentPlayer();
-            if (currentPlayer == null || currentPlayer.isHuman) {
-                //trace("Current player is null or human, skipping CPU turn");
-                updatePlayerInfoDisplay();
-                return;
-            }
+        var currentPlayer = unoGame.turnManager.getCurrentPlayer();
+        if (currentPlayer == null || currentPlayer.isHuman) {
+            //trace("Current player is null or human, skipping CPU turn");
+            updatePlayerInfoDisplay();
+            return;
+        }
 
-            if (Std.isOfType(currentPlayer, UnoCPU)) {
-                var cpuPlayer = cast(currentPlayer, UnoCPU);
+        if (Std.isOfType(currentPlayer, UnoCPU)) {
+            var cpuPlayer = cast(currentPlayer, UnoCPU);
 
-                // Get top card safely
-                var topCard = unoGame.deck != null ? unoGame.deck.getTopCard() : null;
-                if (topCard == null) {
-                    trace("Cannot process CPU turn: top card is null");
-                    return;
-                }
+            // Get top card safely
+            var topCard = unoGame.deck != null ? unoGame.deck.getTopCard() : null;
+            if (topCard == null) {
+                trace("Cannot process CPU turn: top card is null");
+                return;
+            }
 
-                var playableCards = cpuPlayer.getPlayableCards(topCard);
+            var playableCards = cpuPlayer.getPlayableCards(topCard);
 
-                if (playableCards.length > 0) {
-                    var cardIndex = cpuPlayer.chooseCard(topCard, unoGame.gameState);
-                    if (cardIndex >= 0 && cardIndex < cpuPlayer.hand.cards.length) {
-                        var card = cpuPlayer.hand.cards[cardIndex];
-                        var chosenColor:UnoColor = null;
+            if (playableCards.length > 0) {
+                var cardIndex = cpuPlayer.chooseCard(topCard, unoGame.gameState);
+                if (cardIndex >= 0 && cardIndex < cpuPlayer.hand.cards.length) {
+                    var card = cpuPlayer.hand.cards[cardIndex];
+                    var chosenColor:UnoColor = null;
 
-                        if (card.isWildCard()) {
-                            chosenColor = cpuPlayer.chooseWildColor();
-                        }
+                    if (card.isWildCard()) {
+                        chosenColor = cpuPlayer.chooseWildColor();
+                    }
 
-                        var success = unoGame.playCard(cpuPlayer, cardIndex, chosenColor);
-                        if (!success) {
-                            // If card couldn't be played, draw instead
-                            unoGame.drawCards(cpuPlayer, 1);
-                        }
-                    } else {
+                    var success = unoGame.playCard(cpuPlayer, cardIndex, chosenColor);
+                    if (!success) {
+                        // If card couldn't be played, draw instead
                         unoGame.drawCards(cpuPlayer, 1);
                     }
                 } else {
                     unoGame.drawCards(cpuPlayer, 1);
                 }
+            } else {
+                unoGame.drawCards(cpuPlayer, 1);
             }
-        } catch (e:Dynamic) {
-            trace("Error processing CPU turn: " + e);
         }
     }