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

Merge branch 'assorted-fixes' into 'master'

Browse Source 
Added NPE prevention for situations where AI evaluation for targeting cards with Shroud in MoJhoSto crashes the game.

See merge request core-developers/forge!455
This commit is contained in:
Michael Kamensky
2018-04-21 20:16:58 +00:00
parent b02f8e5dc7 819301c7d8
commit 78525a830b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4985,7 +4985,10 @@ public class Card extends GameEntity implements Comparable<Card> {
StringBuilder sb = new StringBuilder();
sb.append("Can target CardUID_").append(String.valueOf(getId()));
sb.append(" with spells and abilities as though it didn't have shroud.");
if (!sa.getActivatingPlayer().hasKeyword(sb.toString())) {
if (sa.getActivatingPlayer() == null) {
System.err.println("Unexpected behavior: SA activator was null when trying to determine if the activating player could target a card with Shroud. SA host card = " + source + ", SA = " + sa);
result.setFalse(); // FIXME: maybe this should check by SA host card controller at this point instead?
} else if (!sa.getActivatingPlayer().hasKeyword(sb.toString())) {
result.setFalse();
}
break;