External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed NPE errors on missing card (game.getCard can't find card);

Browse source
This commit is contained in:
Oleg Agafonov 2020-01-15 07:08:56 +04:00
parent c30316512b
commit 745bfa2836
9 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/cards/CardsImpl.java
View file

@ -129,7 +129,7 @@ public class CardsImpl extends LinkedHashSet<UUID> implements Cards, Serializabl
@Override
public Set<Card> getCards(FilterCard filter, Game game) {
return stream().map(game::getCard).filter(card -> filter.match(card, game)).collect(Collectors.toSet());
return stream().map(game::getCard).filter(Objects::nonNull).filter(card -> filter.match(card, game)).collect(Collectors.toSet());
}
@Override

2
Mage/src/main/java/mage/players/Library.java
View file

@ -164,7 +164,7 @@ public class Library implements Serializable {
* @return
*/
public List<Card> getCards(Game game) {
return library.stream().map(game::getCard).collect(Collectors.toList());
return library.stream().map(game::getCard).filter(Objects::nonNull).collect(Collectors.toList());
}
public Set<Card> getTopCards(Game game, int amount) {