diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java index 4b3f61666cd..58517b70994 100644 --- a/forge-game/src/main/java/forge/game/zone/MagicStack.java +++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java @@ -766,6 +766,10 @@ public class MagicStack /* extends MyObservable */ implements Iterable { * @param model * @param viewer */ public void updateStack(final IGameView model, final PlayerView localPlayer) { - final java.util.List items = model.getStack(); + final List items = model.getStack(); tab.setText("Stack : " + items.size()); // No need to update the rest unless it's showing diff --git a/forge-gui-mobile/src/forge/screens/match/views/VStack.java b/forge-gui-mobile/src/forge/screens/match/views/VStack.java index 8d73fa17763..1214033d211 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VStack.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VStack.java @@ -2,7 +2,6 @@ package forge.screens.match.views; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -138,9 +137,8 @@ public class VStack extends FDropDown { StackItemView stackInstance = null; StackInstanceDisplay display = null; float overlap = Math.round(CARD_HEIGHT / 2 + PADDING + BORDER_THICKNESS); - Iterator iterator = stack.iterator(); - while (iterator.hasNext()) { - stackInstance = iterator.next(); + for (int i = stack.size() - 1; i >= 0; i--) { + stackInstance = stack.get(i); display = new StackInstanceDisplay(stackInstance, width); if (activeStackInstance == stackInstance) { activeItem = display; @@ -149,7 +147,7 @@ public class VStack extends FDropDown { add(display); } //use full preferred height of display for topmost item on stack, overlap amount for other items - display.setBounds(x, y, width, iterator.hasNext() ? overlap : display.preferredHeight); + display.setBounds(x, y, width, i > 0 ? overlap : display.preferredHeight); y += display.getHeight(); } if (activeStackInstance == null) { diff --git a/forge-gui/src/main/java/forge/view/LocalGameView.java b/forge-gui/src/main/java/forge/view/LocalGameView.java index 3526bc71952..8e33d3aeb2b 100644 --- a/forge-gui/src/main/java/forge/view/LocalGameView.java +++ b/forge-gui/src/main/java/forge/view/LocalGameView.java @@ -248,8 +248,7 @@ public abstract class LocalGameView implements IGameView { */ @Override public StackItemView peekStack() { - final SpellAbilityStackInstance top = - Iterables.getFirst(game.getStack(), null); + final SpellAbilityStackInstance top = game.getStack().peek(); if (top == null) { return null; }