still more Deck Editor changes

This commit is contained in:
BetaSteward 2011-01-11 15:51:57 -05:00
parent 436c48b17e
commit f74df18cc9
11 changed files with 132 additions and 69 deletions

View file

@ -238,9 +238,8 @@ public class GameController implements GameCallback {
}
public boolean cheat(UUID sessionId, UUID playerId, String cardName) {
String clazz = Sets.findCard(cardName);
if (clazz != null) {
Card card = CardImpl.createCard(clazz);
Card card = Sets.findCard(cardName, true);
if (card != null) {
Set<Card> cards = new HashSet<Card>();
cards.add(card);
game.loadCards(cards, playerId);
@ -463,17 +462,12 @@ public class GameController implements GameCallback {
String cardName = m.group(3);
Integer amount = Integer.parseInt(m.group(4));
for (int i = 0; i < amount; i++) {
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);
}
Card card = Sets.findCard(cardName, true);
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 find a card: " + cardName);
}