External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-24 12:19:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Quicken - Fixed possible null pointer exception.

Browse source
This commit is contained in:
LevelX2 2016-01-30 11:38:08 +01:00
parent d3ff285cc5
commit 3f898aa67b
2 changed files with 78 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Mage.Sets/src/mage/sets/guildpact/Quicken.java
View file

@ -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<String> 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);
}