External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 20:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Coalition Relic - Fixed handling of not in game player.

Browse source
This commit is contained in:
LevelX2 2014-06-11 08:30:18 +02:00
parent 953fbca0db
commit aa5cd4d72b
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/sets/futuresight/CoalitionRelic.java
View file

@ -104,7 +104,10 @@ class CoalitionRelicEffect extends OneShotEffect {
Mana mana = new Mana();
ChoiceColor choice = new ChoiceColor();
for (int i = 0; i < chargeCounters; i++) {
while (player.isInGame() && !choice.isChosen()) {
while (!choice.isChosen()) {
if (!player.isInGame()) {
return false;
}
player.choose(outcome, choice, game);
}
if (choice.getColor().isBlack()) {

16
Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java
View file

@ -29,10 +29,6 @@ package mage.sets.urzassaga;
import java.util.LinkedHashSet;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
@ -40,6 +36,9 @@ import mage.abilities.effects.common.ManaEffect;
import mage.cards.CardImpl;
import mage.choices.ChoiceColor;
import mage.choices.ChoiceImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.CardTypePredicate;
@ -98,10 +97,9 @@ class CarpetOfFlowersTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if((event.getType() == GameEvent.EventType.PRECOMBAT_MAIN_PHASE_PRE || event.getType() == GameEvent.EventType.POSTCOMBAT_MAIN_PHASE_PRE) && event.getPlayerId().equals(this.controllerId)){
return true;
}
return false;
return (event.getType() == GameEvent.EventType.PRECOMBAT_MAIN_PHASE_PRE
|| event.getType() == GameEvent.EventType.POSTCOMBAT_MAIN_PHASE_PRE)
&& event.getPlayerId().equals(this.controllerId);
}
@Override
@ -168,7 +166,7 @@ class CarpetOfFlowersEffect extends ManaEffect {
if(player != null){
int countMax = game.getBattlefield().count(filter, source.getSourceId(), source.getTargets().getFirstTarget(), game);
ChoiceImpl choiceCount = new ChoiceImpl(true);
LinkedHashSet<String> set = new LinkedHashSet<String>();
LinkedHashSet<String> set = new LinkedHashSet<>();
for(int i = 0; i <= countMax; i++)
{
set.add(Integer.toString(i));