external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

- NPE prevention for RememberMap in Card.

Browse Source
This commit is contained in:
Agetian
2017-07-13 06:32:29 +00:00
parent aa07530bd3
commit d7ea4cdf6a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -5408,11 +5408,13 @@ public class Card extends GameEntity implements Comparable<Card> {
for (SpellAbility sa : source.getSpellAbilities()) {
if (sa.getActivatingPlayer() == null) continue;
for (Player p : AbilityUtils.getDefinedPlayers(source, property.split("RememberMap_")[1], sa)) {
if (source.getRememberMap() != null && source.getRememberMap().get(p) != null) {
if (source.getRememberMap().get(p).contains(this)) {
return true;
}
}
}
}
return false;
} else if (property.equals("IsRemembered")) {
if (!source.isRemembered(this)) {