From d3c3e6fe43e31139b23e412a730f0ee2f690bf1e Mon Sep 17 00:00:00 2001 From: drdev Date: Mon, 13 Oct 2014 02:29:42 +0000 Subject: [PATCH] Prevent passing game object to client when adding card to field --- forge-game/src/main/java/forge/game/card/Card.java | 1 - forge-gui/src/main/java/forge/player/PlayerControllerHuman.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 1b0cb777d4f..619c3c9ed74 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -6271,7 +6271,6 @@ public class Card extends GameEntity implements Comparable, IIdentifiable public List getAllPossibleAbilities(Player player, boolean removeUnplayable) { // this can only be called by the Human - final List abilities = new ArrayList(); for (SpellAbility sa : getSpellAbilities()) { //add alternative costs as additional spell abilities diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index dcab088ec8d..914856986df 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1744,7 +1744,7 @@ public class PlayerControllerHuman extends PlayerController { } public void addCardToBattlefield() { - final Player p = SGuiChoose.oneOrNone("Put card in play for which player?", (FCollection)game.getPlayers()); + final Player p = Player.get(SGuiChoose.oneOrNone("Put card in play for which player?", PlayerView.getCollection(game.getPlayers()))); if (p == null) { return; }