From 792fdad4be4aefb35c512c7de315000e6c481805 Mon Sep 17 00:00:00 2001 From: Meerkov Date: Thu, 19 Apr 2018 16:19:58 -0700 Subject: [PATCH] Tiny Update: Removes dead code. Just removes some code that does nothing. (cherry picked from commit b462c41dff99f0173b7e228f826ca0bf0d8103cb) --- .../src/main/java/forge/game/keyword/KeywordCollection.java | 2 +- .../src/test/java/forge/ai/simulation/GameSimulatorTest.java | 2 +- forge-gui/src/main/java/forge/quest/QuestDraftUtils.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/forge-game/src/main/java/forge/game/keyword/KeywordCollection.java b/forge-game/src/main/java/forge/game/keyword/KeywordCollection.java index 80393dc2186..96dbca811eb 100644 --- a/forge-game/src/main/java/forge/game/keyword/KeywordCollection.java +++ b/forge-game/src/main/java/forge/game/keyword/KeywordCollection.java @@ -35,7 +35,7 @@ public class KeywordCollection implements Iterable, Serializable { } public int size() { - return map.values().size(); + return map.size(); } public int getAmount(Keyword keyword) { diff --git a/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java b/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java index e60aaa52a0e..f442d62b4e0 100644 --- a/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java +++ b/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java @@ -183,7 +183,7 @@ public class GameSimulatorTest extends SimulationTestCase { GameSimulator sim = createSimulator(game, p); Game simGame = sim.getSimulatedGameState(); - SpellAbility unmorphSA = findSAWithPrefix(ripper, "Morph—Reveal a black card"); + SpellAbility unmorphSA = findSAWithPrefix(ripper, "Morph"); // —Reveal a black card assertNotNull(unmorphSA); sim.simulateSpellAbility(unmorphSA); assertEquals(18, simGame.getPlayers().get(0).getLife()); diff --git a/forge-gui/src/main/java/forge/quest/QuestDraftUtils.java b/forge-gui/src/main/java/forge/quest/QuestDraftUtils.java index 54a67f8f575..91ceec02115 100644 --- a/forge-gui/src/main/java/forge/quest/QuestDraftUtils.java +++ b/forge-gui/src/main/java/forge/quest/QuestDraftUtils.java @@ -368,9 +368,6 @@ public class QuestDraftUtils { // Update dialog with winner } - RegisteredPlayer regPlayer = mc.getWinner(); - //draft.setWinner(regPlayer.getPlayer().getName()); - //FModel.getQuest().save(); gui.finishGame(); } else { final HostedMatch newMatch = GuiBase.getInterface().hostMatch();