diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java index 1c1de1c48db..d2664ea2d5b 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchController.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java @@ -96,6 +96,7 @@ public class MatchController extends AbstractGuiGame { return avatar; } + @Override public void refreshCardDetails(Iterable cards) { //ensure cards appear in the correct row of the field for (VPlayerPanel pnl : view.getPlayerPanels().values()) { diff --git a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java index f5e187fa83e..de17abf74e1 100644 --- a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java +++ b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java @@ -82,15 +82,13 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base { synchronized (cardsUpdate) { if (!cardsUpdate.isEmpty()) { - for (final CardView c : cardsUpdate) { - matchController.updateSingleCard(c); - } + matchController.updateCards(cardsUpdate); cardsUpdate.clear(); } } synchronized (cardsRefreshDetails) { if (!cardsRefreshDetails.isEmpty()) { - matchController.updateCards(cardsRefreshDetails); + matchController.refreshCardDetails(cardsRefreshDetails); cardsRefreshDetails.clear(); } } diff --git a/forge-gui/src/main/java/forge/interfaces/IGuiGame.java b/forge-gui/src/main/java/forge/interfaces/IGuiGame.java index abd8afb602a..db717b7630f 100644 --- a/forge-gui/src/main/java/forge/interfaces/IGuiGame.java +++ b/forge-gui/src/main/java/forge/interfaces/IGuiGame.java @@ -48,6 +48,7 @@ public interface IGuiGame { void updateZones(Iterable zonesToUpdate); void updateSingleCard(CardView card); void updateCards(Iterable cards); + void refreshCardDetails(Iterable cards); void updateManaPool(Iterable manaPoolUpdate); void updateLives(Iterable livesUpdate); void setPanelSelection(CardView hostCard); diff --git a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java index 8c270da1a11..ccd9f4046cd 100644 --- a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java +++ b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java @@ -91,6 +91,11 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards { } } + @Override + public void refreshCardDetails(final Iterable cards) { + //not needed for base game implementation + } + public String getCardImageKey(final CardStateView csv) { return csv.getImageKey(getLocalPlayers()); }