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

Minor formatting.

Browse source
This commit is contained in:
LevelX2 2013-06-11 17:22:21 +02:00
parent 21e88c1ce3
commit 140bf42f60
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/mage/cards/CardsImpl.java
View file

@ -87,15 +87,17 @@ public class CardsImpl extends LinkedHashSet<UUID> implements Cards, Serializabl
@Override
public Card get(UUID cardId, Game game) {
if (this.contains(cardId))
if (this.contains(cardId)) {
return game.getCard(cardId);
}
return null;
}
@Override
public void remove(Card card) {
if (card == null)
if (card == null) {
return;
}
this.remove(card.getId());
}
@ -109,8 +111,9 @@ public class CardsImpl extends LinkedHashSet<UUID> implements Cards, Serializabl
@Override
public Card getRandom(Game game) {
if (this.size() == 0)
if (this.size() == 0) {
return null;
}
UUID[] cards = this.toArray(new UUID[0]);
return game.getCard(cards[rnd.nextInt(cards.length)]);
}
@ -118,9 +121,10 @@ public class CardsImpl extends LinkedHashSet<UUID> implements Cards, Serializabl
@Override
public int count(FilterCard filter, Game game) {
int result = 0;
for (UUID card: this) {
if (filter.match(game.getCard(card), game))
for (UUID cardId: this) {
if (filter.match(game.getCard(cardId), game)) {
result++;
}
}
return result;
}