From 3f898aa67b108536f171e2519da2bbba32c53384 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 30 Jan 2016 11:38:08 +0100 Subject: [PATCH] * Quicken - Fixed possible null pointer exception. --- .../src/mage/sets/guildpact/Quicken.java | 16 ++--- .../cards/asthough/CastAsInstantTest.java | 70 +++++++++++++++++++ 2 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/asthough/CastAsInstantTest.java diff --git a/Mage.Sets/src/mage/sets/guildpact/Quicken.java b/Mage.Sets/src/mage/sets/guildpact/Quicken.java index 35a3f0e25b4..6837abf90ab 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Quicken.java +++ b/Mage.Sets/src/mage/sets/guildpact/Quicken.java @@ -93,11 +93,11 @@ class QuickenAsThoughEffect extends AsThoughEffectImpl { @Override public void init(Ability source, Game game) { - quickenWatcher = (QuickenWatcher) game.getState().getWatchers().get("consumeQuickenWatcher", source.getControllerId()); + quickenWatcher = (QuickenWatcher) game.getState().getWatchers().get("consumeQuickenWatcher"); Card card = game.getCard(source.getSourceId()); if (quickenWatcher != null && card != null) { zoneChangeCounter = card.getZoneChangeCounter(game); - quickenWatcher.addQuickenSpell(source.getSourceId(), zoneChangeCounter); + quickenWatcher.addQuickenSpell(source.getControllerId(), source.getSourceId(), zoneChangeCounter); } } @@ -113,7 +113,7 @@ class QuickenAsThoughEffect extends AsThoughEffectImpl { @Override public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) { - if (quickenWatcher.isQuickenSpellActive(source.getSourceId(), zoneChangeCounter)) { + if (quickenWatcher.isQuickenSpellActive(affectedControllerId, source.getSourceId(), zoneChangeCounter)) { Card card = game.getCard(sourceId); if (card != null && card.getCardType().contains(CardType.SORCERY) && source.getControllerId().equals(affectedControllerId)) { return true; @@ -129,7 +129,7 @@ class QuickenWatcher extends Watcher { public List activeQuickenSpells = new ArrayList<>(); public QuickenWatcher() { - super("consumeQuickenWatcher", WatcherScope.PLAYER); + super("consumeQuickenWatcher", WatcherScope.GAME); } public QuickenWatcher(final QuickenWatcher watcher) { @@ -153,13 +153,13 @@ class QuickenWatcher extends Watcher { } } - public void addQuickenSpell(UUID sourceId, int zoneChangeCounter) { - String spellKey = new StringBuilder(sourceId.toString()).append("_").append(zoneChangeCounter).toString(); + public void addQuickenSpell(UUID playerId, UUID sourceId, int zoneChangeCounter) { + String spellKey = playerId.toString() + sourceId.toString() + "_" + zoneChangeCounter; activeQuickenSpells.add(spellKey); } - public boolean isQuickenSpellActive(UUID sourceId, int zoneChangeCounter) { - String spellKey = new StringBuilder(sourceId.toString()).append("_").append(zoneChangeCounter).toString(); + public boolean isQuickenSpellActive(UUID playerId, UUID sourceId, int zoneChangeCounter) { + String spellKey = playerId.toString() + sourceId.toString() + "_" + zoneChangeCounter; return activeQuickenSpells.contains(spellKey); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/CastAsInstantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/CastAsInstantTest.java new file mode 100644 index 00000000000..a66816c8580 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/CastAsInstantTest.java @@ -0,0 +1,70 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package org.mage.test.cards.asthough; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ +public class CastAsInstantTest extends CardTestPlayerBase { + + @Test + public void testEffectOnlyForOneTurn() { + addCard(Zone.BATTLEFIELD, playerB, "Island"); + addCard(Zone.BATTLEFIELD, playerB, "Swamp", 4); + // The next sorcery card you cast this turn can be cast as though it had flash. + // Draw a card. + addCard(Zone.HAND, playerB, "Quicken"); // {U} + // Devoid (This card has no color.) + // Target opponent exiles two cards from his or her hand and loses 2 life. + addCard(Zone.HAND, playerB, "Witness the End"); // {3}{B} + + addCard(Zone.HAND, playerA, "Silvercoat Lion", 2); + + castSpell(1, PhaseStep.UPKEEP, playerB, "Quicken"); + castSpell(1, PhaseStep.UPKEEP, playerB, "Witness the End", playerA); + + setStopAt(1, PhaseStep.PRECOMBAT_MAIN); + execute(); + + assertGraveyardCount(playerB, "Quicken", 1); + assertGraveyardCount(playerB, "Witness the End", 1); + + assertExileCount("Silvercoat Lion", 2); + + assertLife(playerA, 18); + assertLife(playerB, 20); + + } + +}