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

Merge branch 'fixTokenScriptAgain' into 'master'

Browse Source 
TokenInfo: fix if script is null

See merge request core-developers/forge!1415
This commit is contained in:
Michael Kamensky
2019-02-23 13:44:07 +00:00
parent ea2b61cf5b 0c2cfdce34
commit 38d3f76bb5
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-ai/src/main/java/forge/ai/ability/TokenAi.java
View File

@@ -63,15 +63,6 @@ public class TokenAi extends SpellAbilityAi {
this.actualToken = TokenInfo.getProtoType(mapParams.getParam("TokenScript"), mapParams); this.actualToken = TokenInfo.getProtoType(mapParams.getParam("TokenScript"), mapParams);
if (actualToken == null) { if (actualToken == null) {
String[] keywords;
if (mapParams.hasParam("TokenKeywords")) {
// TODO: Change this Split to a semicolon or something else
keywords = mapParams.getParam("TokenKeywords").split("<>");
} else {
keywords = new String[0];
}
this.tokenPower = mapParams.getParam("TokenPower"); this.tokenPower = mapParams.getParam("TokenPower");
this.tokenToughness = mapParams.getParam("TokenToughness"); this.tokenToughness = mapParams.getParam("TokenToughness");
} else { } else {

4
forge-game/src/main/java/forge/game/card/token/TokenInfo.java
View File

@@ -226,6 +226,10 @@ public class TokenInfo {
} }
static public Card getProtoType(final String script, final SpellAbility sa) { static public Card getProtoType(final String script, final SpellAbility sa) {
// script might be null, or sa might be null
if (script == null || sa == null) {
return null;
}
final Card host = sa.getHostCard(); final Card host = sa.getHostCard();
final Game game = host.getGame(); final Game game = host.getGame();