Prevent mulligans resulting in face down cards

forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java

@@ -472,6 +472,7 @@ public final class CMatchUI
             if (hand != null) {
                 CardPanel cp = hand.getHandArea().getCardPanel(c.getId());
                 if (cp != null) {
+                    cp.setCard(c); //ensure card view updated
                     cp.repaintOverlays();
                 }
             }

forge-gui-desktop/src/main/java/forge/screens/match/controllers/CHand.java

@@ -125,14 +125,8 @@ public class CHand implements ICDoc {
         }
 
         synchronized (ordering) {
-            // Remove old cards from ordering
+            ordering.clear();
-            ordering.retainAll(cards);
+            ordering.addAll(cards);
-            // Append new cards to ordering
-            for (final CardView c : cards) {
-                if (!ordering.contains(c)) {
-                    ordering.add(c);
-                }
-            }
         }
 
         final List<CardPanel> placeholders = new ArrayList<CardPanel>();
@@ -145,6 +139,9 @@ public class CHand implements ICDoc {
                 cardPanel.setDisplayEnabled(false);
                 placeholders.add(cardPanel);
             }
+            else {
+                cardPanel.setCard(card); //ensure card view is updated
+            }
             cardPanels.add(cardPanel);
         }
 

forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java

@@ -533,16 +533,15 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
     /** {@inheritDoc} */
     @Override
     public final void setCard(final CardView cardView) {
-        if ((getCard() != null) && getCard().equals(cardView) && isAnimationPanel
+        CardView oldCard = card;
-                && imagePanel.hasImage()) {
+        card = cardView; //always update card in case new card view instance for same card
-            return;
-        }
-
-        card = cardView;
 
         if (imagePanel == null) {
             return;
         }
+        if (oldCard != null && oldCard.equals(card) && isAnimationPanel && imagePanel.hasImage()) {
+            return; //prevent unnecessary update logic for animation panel
+        }
 
         updateText();
         updatePTOverlay();

forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java

@@ -264,7 +264,7 @@ public class FloatingCardArea extends CardArea {
                     cardPanel.setDisplayEnabled(true);
                 }
                 else {
-                    cardPanel.updateImage(); //ensure image updated in case visibility changed
+                    cardPanel.setCard(card); //ensure card view updated
                 }
                 cardPanels.add(cardPanel);
             }