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

Fixed NullPointerException in case card wasn't found by name. Fixed CardGrid (didn't removed mage card if card plugin was used)

Browse source
This commit is contained in:
magenoxx 2010-11-22 16:45:26 +00:00
parent 6e9159f86e
commit b1858396a5
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Mage.Server/src/mage/server/game/GameController.java
View file

@ -438,14 +438,19 @@ public class GameController implements GameCallback {
String cardName = m.group(3);
Integer amount = Integer.parseInt(m.group(4));
for (int i = 0; i < amount; i++) {
Card card = CardImpl.createCard(Sets.findCard(cardName));
if (card != null) {
Set<Card> cards = new HashSet<Card>();
cards.add(card);
game.loadCards(cards, player.getId());
swapWithAnyCard(game, player, card, gameZone);
String clazz = Sets.findCard(cardName);
if (clazz != null) {
Card card = CardImpl.createCard(clazz);
if (card != null) {
Set<Card> cards = new HashSet<Card>();
cards.add(card);
game.loadCards(cards, player.getId());
swapWithAnyCard(game, player, card, gameZone);
} else {
logger.severe("Couldn't create a card: " + cardName);
}
} else {
logger.severe("Couldn't create a card: " + cardName);
logger.severe("Couldn't find a card: " + cardName);
}
}
} else {