github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-13 03:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed cards with endless loops if a player left game while he has to make a choice.

Browse source
This commit is contained in:
LevelX2 2013-10-02 08:08:09 +02:00
parent 8007b16d64
commit 1dabfbb07b
14 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/alarareborn/TraceOfAbundance.java
View file

@ -145,7 +145,7 @@ class TraceOfAbundanceEffect extends ManaEffect<TraceOfAbundanceEffect> {
Player player = game.getPlayer(land.getControllerId());
if (player != null) {
ChoiceColor choice = new ChoiceColor();
while (!player.choose(outcome, choice, game)) {
while (!player.choose(outcome, choice, game) && player.isInGame()) {
game.debugMessage("player canceled choosing color. retrying.");
}
int amount = 1;

2
Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java
View file

@ -108,7 +108,7 @@ class CavernOfSoulsEffect extends OneShotEffect<CavernOfSoulsEffect> {
Choice typeChoice = new ChoiceImpl(true);
typeChoice.setMessage("Choose creature type");
typeChoice.setChoices(CardRepository.instance.getCreatureTypes());
while (!player.choose(Outcome.Benefit, typeChoice, game)) {
while (!player.choose(Outcome.Benefit, typeChoice, game) && player.isInGame()) {
game.debugMessage("player canceled choosing type. retrying.");
}
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice());

10
Mage.Sets/src/mage/sets/avacynrestored/RidersOfGavony.java
View file

@ -102,12 +102,14 @@ class RidersOfGavonyEffect extends OneShotEffect<RidersOfGavonyEffect> {
Choice typeChoice = new ChoiceImpl(true);
typeChoice.setMessage("Choose creature type");
typeChoice.setChoices(CardRepository.instance.getCreatureTypes());
while (!player.choose(Outcome.BoostCreature, typeChoice, game)) {
while (!player.choose(Outcome.BoostCreature, typeChoice, game) && player.isInGame()) {
game.debugMessage("player canceled choosing type. retrying.");
}
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice());
game.getState().setValue(permanent.getId() + "_type", typeChoice.getChoice());
permanent.addInfo("chosen type", "<i>Chosen type: " + typeChoice.getChoice().toString() + "</i>");
if (typeChoice.getChoice() != null) {
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice());
game.getState().setValue(permanent.getId() + "_type", typeChoice.getChoice());
permanent.addInfo("chosen type", "<i>Chosen type: " + typeChoice.getChoice().toString() + "</i>");
}
}
return false;
}

4
Mage.Sets/src/mage/sets/dragonsmaze/PlasmCapture.java
View file

@ -133,8 +133,8 @@ class PlasmCaptureManaEffect extends ManaEffect<PlasmCaptureManaEffect> {
Mana mana = new Mana();
for(int i = 0; i < amountOfMana; i++){
ChoiceColor choiceColor = new ChoiceColor();
while (!player.choose(Outcome.Benefit, choiceColor, game)) {
game.debugMessage("player canceled choosing color. retrying.");
while (!player.choose(Outcome.Benefit, choiceColor, game) && player.isInGame()) {
game.debugMessage("player canceled choosing color. retrying." );
}
if (choiceColor.getColor().isBlack()) {

2
Mage.Sets/src/mage/sets/gatecrash/VerdantHaven.java
View file

@ -140,7 +140,7 @@ class VerdantHavenManaEffect extends ManaEffect<VerdantHavenManaEffect> {
Player player = game.getPlayer(land.getControllerId());
if (player != null) {
ChoiceColor choice = new ChoiceColor();
while (!player.choose(outcome, choice, game)) {
while (!player.choose(outcome, choice, game) && player.isInGame()) {
game.debugMessage("player canceled choosing color. retrying.");
}
int amount = 1;

2
Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java
View file

@ -95,7 +95,7 @@ class ConundrumSphinxEffect extends OneShotEffect<ConundrumSphinxEffect> {
for (Player player: game.getPlayers().values()) {
if(player.getLibrary().size() > 0){
cardChoice.clearChoice();
while (!player.choose(Outcome.DrawCard, cardChoice, game)) {
while (!player.choose(Outcome.DrawCard, cardChoice, game) && player.isInGame()) {
game.debugMessage("player canceled choosing name. retrying.");
}
String cardName = cardChoice.getChoice();

2
Mage.Sets/src/mage/sets/magic2012/AdaptiveAutomaton.java
View file

@ -95,7 +95,7 @@ class AdaptiveAutomatonEffect extends OneShotEffect<AdaptiveAutomatonEffect> {
Choice typeChoice = new ChoiceImpl(true);
typeChoice.setMessage("Choose creature type");
typeChoice.setChoices(CardRepository.instance.getCreatureTypes());
while (!player.choose(Outcome.BoostCreature, typeChoice, game)) {
while (!player.choose(Outcome.BoostCreature, typeChoice, game) && player.isInGame()) {
game.debugMessage("player canceled choosing type. retrying.");
}
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice());

2
Mage.Sets/src/mage/sets/magic2014/DoorOfDestinies.java
View file

@ -107,7 +107,7 @@ class ChooseCreatureTypeEffect extends OneShotEffect<ChooseCreatureTypeEffect> {
Choice typeChoice = new ChoiceImpl(true);
typeChoice.setMessage("Choose creature type");
typeChoice.setChoices(CardRepository.instance.getCreatureTypes());
while (!player.choose(Outcome.BoostCreature, typeChoice, game)) {
while (!player.choose(Outcome.BoostCreature, typeChoice, game) && player.isInGame()) {
game.debugMessage("player canceled choosing type. retrying.");
}
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice());

2
Mage.Sets/src/mage/sets/newphyrexia/Xenograft.java
View file

@ -97,7 +97,7 @@ class XenograftEffect extends OneShotEffect<XenograftEffect> {
Choice typeChoice = new ChoiceImpl(true);
typeChoice.setMessage("Choose creature type");
typeChoice.setChoices(CardRepository.instance.getCreatureTypes());
while (!player.choose(Outcome.BoostCreature, typeChoice, game)) {
while (!player.choose(Outcome.BoostCreature, typeChoice, game) && player.isInGame()) {
game.debugMessage("player canceled choosing type. retrying.");
}
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice());

2
Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java
View file

@ -105,7 +105,7 @@ class WordsOfWindEffect extends ReplacementEffectImpl<WordsOfWindEffect> {
TargetControlledPermanent target = new TargetControlledPermanent();
List<Permanent> liste = game.getBattlefield().getActivePermanents(new FilterControlledPermanent(), playerId, game);
if(!liste.isEmpty()){
while (!player.choose(Outcome.ReturnToHand, target, source.getSourceId(), game)){
while (!player.choose(Outcome.ReturnToHand, target, source.getSourceId(), game) && player.isInGame()){
game.debugMessage("player canceled choosing permanent. retrying.");
}
Permanent permanent = game.getPermanent(target.getFirstTarget());

2
Mage.Sets/src/mage/sets/returntoravnica/AxebaneGuardian.java
View file

@ -111,7 +111,7 @@ class AxebaneGuardianManaEffect extends ManaEffect<AxebaneGuardianManaEffect> {
Mana mana = new Mana();
for(int i = 0; i < x; i++){
ChoiceColor choiceColor = new ChoiceColor();
while (!player.choose(Outcome.Benefit, choiceColor, game)) {
while (!player.choose(Outcome.Benefit, choiceColor, game) && player.isInGame()) {
game.debugMessage("player canceled choosing color. retrying.");
}

4
Mage.Sets/src/mage/sets/returntoravnica/TabletOfTheGuilds.java
View file

@ -91,7 +91,7 @@ class TabletOfTheGuildsEntersBattlefieldEffect extends OneShotEffect<TabletOfThe
String colors;
ChoiceColor colorChoice = new ChoiceColor();
colorChoice.setMessage("Choose the first color");
while (!player.choose(Outcome.GainLife, colorChoice, game)) {
while (!player.choose(Outcome.GainLife, colorChoice, game) && player.isInGame()) {
game.debugMessage("player canceled choosing type. retrying.");
}
game.getState().setValue(permanent.getId() + "_color1", colorChoice.getColor().toString());
@ -99,7 +99,7 @@ class TabletOfTheGuildsEntersBattlefieldEffect extends OneShotEffect<TabletOfThe
colorChoice.getChoices().remove(colorChoice.getChoice());
colorChoice.setMessage("Choose the second color");
while (!player.choose(Outcome.GainLife, colorChoice, game)) {
while (!player.choose(Outcome.GainLife, colorChoice, game) && player.isInGame()) {
game.debugMessage("player canceled choosing type. retrying.");
}
game.getState().setValue(permanent.getId() + "_color2", colorChoice.getColor().toString());

2
Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java
View file

@ -129,7 +129,7 @@ class XenagosManaEffect extends OneShotEffect <XenagosManaEffect> {
for(int i = 0; i < x; i++){
Mana mana = new Mana();
while (!player.choose(Outcome.Benefit, manaChoice, game)) {
while (!player.choose(Outcome.Benefit, manaChoice, game) && player.isInGame()) {
game.debugMessage("player canceled choosing color. retrying.");
}

2
Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java
View file

@ -90,7 +90,7 @@ public class EngineeredPlague extends CardImpl<EngineeredPlague> {
Choice typeChoice = new ChoiceImpl(true);
typeChoice.setMessage("Choose creature type");
typeChoice.setChoices(CardRepository.instance.getCreatureTypes());
while (!player.choose(Outcome.Detriment, typeChoice, game)) {
while (!player.choose(Outcome.Detriment, typeChoice, game) && player.isInGame()) {
game.debugMessage("player canceled choosing type. retrying.");
}
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice());