Merge branch 'NewMaster' into 'master'

update GameEventCardRegenerated

See merge request core-developers/forge!6395

forge-game/src/main/java/forge/game/ability/effects/RegenerationEffect.java

@@ -36,7 +36,7 @@ public class RegenerationEffect extends SpellAbilityEffect {
             }
 
             // Play the Regen sound
-            game.fireEvent(new GameEventCardRegenerated());
+            game.fireEvent(new GameEventCardRegenerated(c));
             
             if (host.isImmutable()) {
                 c.subtractShield(host);

forge-game/src/main/java/forge/game/event/GameEventCardRegenerated.java

@@ -1,7 +1,17 @@
 package forge.game.event;
 
+import forge.game.card.Card;
+
+import java.util.Arrays;
+import java.util.Collection;
+
 public class GameEventCardRegenerated extends GameEvent {
 
+    public final Collection<Card> cards;
+    public GameEventCardRegenerated(Card affected) {
+        cards = Arrays.asList(affected);
+    }
+
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);

forge-gui/src/main/java/forge/gui/control/FControlGameEventHandler.java

@@ -456,6 +456,13 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
         return processCards(event.cards, cardsUpdate);
     }
 
+    @Override
+    public Void visit(final GameEventCardRegenerated event) {
+        refreshFieldUpdate = true;
+        processCards(event.cards, cardsRefreshDetails);
+        return processCards(event.cards, cardsUpdate);
+    }
+
     @Override
     public Void visit(final GameEventShuffle event) {
         if (GuiBase.getInterface().isLibgdxPort()) {