github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-24 19:19:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed some possible null pointer exceptions.

Browse source
This commit is contained in:
LevelX2 2016-09-20 23:40:25 +02:00
parent ab352100f1
commit c82d6b5566
6 changed files with 171 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -730,11 +730,14 @@ public class HumanPlayer extends PlayerImpl {
} }
private boolean checkPassStep(Game game) { private boolean checkPassStep(Game game) {
if (playerId.equals(game.getActivePlayerId())) { if (game.getStep() != null) {
return !this.getUserData().getUserSkipPrioritySteps().getYourTurn().isPhaseStepSet(game.getStep().getType()); if (playerId.equals(game.getActivePlayerId())) {
} else { return !this.getUserData().getUserSkipPrioritySteps().getYourTurn().isPhaseStepSet(game.getStep().getType());
return !this.getUserData().getUserSkipPrioritySteps().getOpponentTurn().isPhaseStepSet(game.getStep().getType()); } else {
return !this.getUserData().getUserSkipPrioritySteps().getOpponentTurn().isPhaseStepSet(game.getStep().getType());
}
} }
return true;
} }
@Override @Override

2
Mage.Server/src/main/java/mage/server/TableController.java
View file

@ -567,7 +567,7 @@ public class TableController {
String creator = null; String creator = null;
StringBuilder opponent = new StringBuilder(); StringBuilder opponent = new StringBuilder();
for (Entry<UUID, UUID> entry : userPlayerMap.entrySet()) { // no AI players for (Entry<UUID, UUID> entry : userPlayerMap.entrySet()) { // no AI players
if (!match.getPlayer(entry.getValue()).hasQuit()) { if (match.getPlayer(entry.getValue()) != null && !match.getPlayer(entry.getValue()).hasQuit()) {
User user = UserManager.getInstance().getUser(entry.getKey()); User user = UserManager.getInstance().getUser(entry.getKey());
if (user != null) { if (user != null) {
user.ccGameStarted(match.getGame().getId(), entry.getValue()); user.ccGameStarted(match.getGame().getId(), entry.getValue());

297
Mage.Sets/src/mage/sets/kaladesh/BomatCourier.java
View file

@ -1,146 +1,151 @@
/* /*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: * permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this list of * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. * conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 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 * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * 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 * 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 * 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 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * 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 * 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 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* The views and conclusions contained in the software and documentation are those of the * 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 * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.sets.kaladesh; package mage.sets.kaladesh;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.MageObject; import mage.MageObject;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.DiscardHandCost; import mage.abilities.costs.common.DiscardHandCost;
import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.costs.mana.ColoredManaCost;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.HasteAbility;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.ColoredManaSymbol; import mage.constants.ColoredManaSymbol;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.Game; import mage.game.ExileZone;
import mage.players.Player; import mage.game.Game;
import mage.util.CardUtil; import mage.players.Player;
import mage.util.CardUtil;
/**
* /**
* @author emerald000 *
*/ * @author emerald000
public class BomatCourier extends CardImpl { */
public class BomatCourier extends CardImpl {
public BomatCourier(UUID ownerId) {
super(ownerId, 199, "Bomat Courier", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}"); public BomatCourier(UUID ownerId) {
this.expansionSetCode = "KLD"; super(ownerId, 199, "Bomat Courier", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}");
this.subtype.add("Construct"); this.expansionSetCode = "KLD";
this.power = new MageInt(1); this.subtype.add("Construct");
this.toughness = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(1);
// Haste
this.addAbility(HasteAbility.getInstance()); // Haste
this.addAbility(HasteAbility.getInstance());
// Whenever Bomat Courier attacks, exile the top card of your library face down.
this.addAbility(new AttacksTriggeredAbility(new BomatCourierExileEffect(), false)); // Whenever Bomat Courier attacks, exile the top card of your library face down.
this.addAbility(new AttacksTriggeredAbility(new BomatCourierExileEffect(), false));
// {R}, Discard your hand, Sacrifice Bomat Courier: Put all cards exiled with Bomat Courier into their owners' hands.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BomatCourierReturnEffect(), new ColoredManaCost(ColoredManaSymbol.R)); // {R}, Discard your hand, Sacrifice Bomat Courier: Put all cards exiled with Bomat Courier into their owners' hands.
ability.addCost(new DiscardHandCost()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BomatCourierReturnEffect(), new ColoredManaCost(ColoredManaSymbol.R));
ability.addCost(new SacrificeSourceCost()); ability.addCost(new DiscardHandCost());
this.addAbility(ability); ability.addCost(new SacrificeSourceCost());
} this.addAbility(ability);
}
public BomatCourier(final BomatCourier card) {
super(card); public BomatCourier(final BomatCourier card) {
} super(card);
}
@Override
public BomatCourier copy() { @Override
return new BomatCourier(this); public BomatCourier copy() {
} return new BomatCourier(this);
} }
}
class BomatCourierExileEffect extends OneShotEffect {
class BomatCourierExileEffect extends OneShotEffect {
BomatCourierExileEffect() {
super(Outcome.Exile); BomatCourierExileEffect() {
this.staticText = "exile the top card of your library face down"; super(Outcome.Exile);
} this.staticText = "exile the top card of your library face down";
}
BomatCourierExileEffect(final BomatCourierExileEffect effect) {
super(effect); BomatCourierExileEffect(final BomatCourierExileEffect effect) {
} super(effect);
}
@Override
public BomatCourierExileEffect copy() { @Override
return new BomatCourierExileEffect(this); public BomatCourierExileEffect copy() {
} return new BomatCourierExileEffect(this);
}
@Override
public boolean apply(Game game, Ability source) { @Override
Player controller = game.getPlayer(source.getControllerId()); public boolean apply(Game game, Ability source) {
MageObject sourceObject = source.getSourceObject(game); Player controller = game.getPlayer(source.getControllerId());
if (controller != null && sourceObject != null) { MageObject sourceObject = source.getSourceObject(game);
Card card = controller.getLibrary().getFromTop(game); if (controller != null && sourceObject != null) {
if (card != null) { Card card = controller.getLibrary().getFromTop(game);
UUID exileZoneId = CardUtil.getCardExileZoneId(game, source); if (card != null) {
card.setFaceDown(true, game); UUID exileZoneId = CardUtil.getCardExileZoneId(game, source);
controller.moveCardsToExile(card, source, game, false, exileZoneId, sourceObject.getIdName()); card.setFaceDown(true, game);
card.setFaceDown(true, game); controller.moveCardsToExile(card, source, game, false, exileZoneId, sourceObject.getIdName());
return true; card.setFaceDown(true, game);
} return true;
} }
return false; }
} return false;
} }
}
class BomatCourierReturnEffect extends OneShotEffect {
class BomatCourierReturnEffect extends OneShotEffect {
BomatCourierReturnEffect() {
super(Outcome.DrawCard); BomatCourierReturnEffect() {
this.staticText = "Put all cards exiled with {this} into their owners' hands"; super(Outcome.DrawCard);
} this.staticText = "Put all cards exiled with {this} into their owners' hands";
}
BomatCourierReturnEffect(final BomatCourierReturnEffect effect) {
super(effect); BomatCourierReturnEffect(final BomatCourierReturnEffect effect) {
} super(effect);
}
@Override
public BomatCourierReturnEffect copy() { @Override
return new BomatCourierReturnEffect(this); public BomatCourierReturnEffect copy() {
} return new BomatCourierReturnEffect(this);
}
@Override
public boolean apply(Game game, Ability source) { @Override
Player controller = game.getPlayer(source.getControllerId()); public boolean apply(Game game, Ability source) {
if (controller != null) { Player controller = game.getPlayer(source.getControllerId());
return controller.moveCards(game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source.getSourceId(), true)), Zone.HAND, source, game); if (controller != null) {
} ExileZone exileZone = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source.getSourceId(), true));
return false; if (exileZone != null) {
} controller.moveCards(exileZone, Zone.HAND, source, game);
} }
return true;
}
return false;
}
}

2
Mage.Sets/src/mage/sets/kaladesh/LostLegacy.java
View file

@ -81,7 +81,7 @@ class LostLegacyEffect extends SearchTargetGraveyardHandLibraryForCardNameAndExi
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
String cardName = (String) game.getState().getValue(source.getSourceId().toString() + NameACardEffect.INFO_KEY); String cardName = (String) game.getState().getValue(source.getSourceId().toString() + NameACardEffect.INFO_KEY);
Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source));
if (targetPlayer != null) { if (targetPlayer != null && cardName != null && !cardName.isEmpty()) {
FilterCard filter = new FilterCard(); FilterCard filter = new FilterCard();
filter.add(new NamePredicate(cardName)); filter.add(new NamePredicate(cardName));
int cardsInHandBefore = targetPlayer.getHand().count(filter, game); int cardsInHandBefore = targetPlayer.getHand().count(filter, game);

15
Mage.Sets/src/mage/sets/mercadianmasques/FoodChain.java
View file

@ -118,20 +118,19 @@ class FoodChainManaEffect extends ManaEffect {
ChoiceColor choice = new ChoiceColor(); ChoiceColor choice = new ChoiceColor();
controller.choose(Outcome.PutManaInPool, choice, game); controller.choose(Outcome.PutManaInPool, choice, game);
ObjectColor chosenColor = choice.getColor(); ObjectColor chosenColor = choice.getColor();
if (chosenColor == null) {
return false;
}
Mana mana = null; Mana mana = null;
if (chosenColor.isBlack()) { if (chosenColor.isBlack()) {
mana = new FoodChainManaBuilder().setMana(Mana.BlackMana(manaCostExiled + 1), source, game).build(); mana = new FoodChainManaBuilder().setMana(Mana.BlackMana(manaCostExiled + 1), source, game).build();
} } else if (chosenColor.isBlue()) {
else if (chosenColor.isBlue()) {
mana = new FoodChainManaBuilder().setMana(Mana.BlueMana(manaCostExiled + 1), source, game).build(); mana = new FoodChainManaBuilder().setMana(Mana.BlueMana(manaCostExiled + 1), source, game).build();
} } else if (chosenColor.isRed()) {
else if (chosenColor.isRed()) {
mana = new FoodChainManaBuilder().setMana(Mana.RedMana(manaCostExiled + 1), source, game).build(); mana = new FoodChainManaBuilder().setMana(Mana.RedMana(manaCostExiled + 1), source, game).build();
} } else if (chosenColor.isGreen()) {
else if (chosenColor.isGreen()) {
mana = new FoodChainManaBuilder().setMana(Mana.GreenMana(manaCostExiled + 1), source, game).build(); mana = new FoodChainManaBuilder().setMana(Mana.GreenMana(manaCostExiled + 1), source, game).build();
} } else if (chosenColor.isWhite()) {
else if (chosenColor.isWhite()) {
mana = new FoodChainManaBuilder().setMana(Mana.WhiteMana(manaCostExiled + 1), source, game).build(); mana = new FoodChainManaBuilder().setMana(Mana.WhiteMana(manaCostExiled + 1), source, game).build();
} }
if (mana != null) { if (mana != null) {

4
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -996,6 +996,10 @@ public abstract class PlayerImpl implements Player, Serializable {
Zone fromZone = game.getState().getZone(card.getMainCard().getId()); Zone fromZone = game.getState().getZone(card.getMainCard().getId());
card.cast(game, fromZone, ability, playerId); card.cast(game, fromZone, ability, playerId);
Spell spell = game.getStack().getSpell(ability.getId()); Spell spell = game.getStack().getSpell(ability.getId());
if (spell == null) {
logger.error("Got no spell from stack. ability: " + ability.getRule());
return false;
}
// some effects set sourceId to cast without paying mana costs or other costs // some effects set sourceId to cast without paying mana costs or other costs
if (ability.getSourceId().equals(getCastSourceIdWithAlternateMana())) { if (ability.getSourceId().equals(getCastSourceIdWithAlternateMana())) {
Ability spellAbility = spell.getSpellAbility(); Ability spellAbility = spell.getSpellAbility();