From 9ffad0437a022ff7f0c4643d1d06b4b762664a9e Mon Sep 17 00:00:00 2001 From: Agetian Date: Mon, 23 Apr 2018 22:04:15 +0300 Subject: [PATCH] - Updating the card cache directly is no longer needed after the fix in CardFactoryUtil is complete. --- forge-game/src/main/java/forge/game/Game.java | 3 --- forge-game/src/main/java/forge/game/GameAction.java | 4 ---- 2 files changed, 7 deletions(-) diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java index d35cc8eb3a1..0f82a49665c 100644 --- a/forge-game/src/main/java/forge/game/Game.java +++ b/forge-game/src/main/java/forge/game/Game.java @@ -184,9 +184,6 @@ public class Game { public void addCard(int id, Card card) { cardCache.put(Integer.valueOf(id), card); } - public void updateCachedCardZone(CardView cardView, Zone zone) { - cardCache.get(cardView).setZone(zone); - } public CardCollection getCardList(Iterable cardViews) { CardCollection list = new CardCollection(); cardCache.addToList(cardViews, list); diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index b1647acfa25..766a3593dea 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -357,10 +357,6 @@ public class GameAction { zoneTo.add(copied, position, c); // the modified state of the card is also reported here (e.g. for Morbid + Awaken) c.setZone(zoneTo); - // TODO: The card cache in Game is never updated, and that makes Suspend cards not function correctly after - // they ETB. Probably there's a better way. - game.updateCachedCardZone(c.getView(), zoneTo); - if (fromBattlefield) { c.setDamage(0); //clear damage after a card leaves the battlefield c.setHasBeenDealtDeathtouchDamage(false);