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

Merge branch 'NPE' into 'master'

Browse Source 
Fix some NPE from token table

See merge request core-developers/forge!5089
This commit is contained in:
Michael Kamensky
2021-07-23 04:25:47 +00:00
parent 998873f311 0c745c51fd
commit 445826e50e
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -358,7 +358,8 @@ public class TokenAi extends SpellAbilityAi {
if (!sa.hasParam("TokenScript")) { if (!sa.hasParam("TokenScript")) {
throw new RuntimeException("Spell Ability has no TokenScript: " + sa); throw new RuntimeException("Spell Ability has no TokenScript: " + sa);
} }
Card result = TokenInfo.getProtoType(sa.getParam("TokenScript"), sa, ai); // TODO for now, only checking the first token is good enough
Card result = TokenInfo.getProtoType(sa.getParam("TokenScript").split(",")[0], sa, ai);
if (result == null) { if (result == null) {
throw new RuntimeException("don't find Token for TokenScript: " + sa.getParam("TokenScript")); throw new RuntimeException("don't find Token for TokenScript: " + sa.getParam("TokenScript"));

29
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1319,14 +1319,17 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
} }
if (sa.hasParam("TokenScript")) { if (sa.hasParam("TokenScript")) {
sa.setActivatingPlayer(player); sa.setActivatingPlayer(player);
Card protoType = TokenInfo.getProtoType(sa.getParam("TokenScript"), sa, null); for (String token : sa.getParam("TokenScript").split(",")) {
for (String type : protoType.getType().getCreatureTypes()) { Card protoType = TokenInfo.getProtoType(token, sa, null);
Integer count = typesInDeck.get(type); for (String type : protoType.getType().getCreatureTypes()) {
if (count == null) { Integer count = typesInDeck.get(type);
count = 0; if (count == null) {
count = 0;
}
typesInDeck.put(type, count + 1);
} }
typesInDeck.put(type, count + 1);
} }
} }
} }
// same for Trigger that does make Tokens // same for Trigger that does make Tokens
@@ -1335,13 +1338,15 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
if (sa != null) { if (sa != null) {
if (sa.hasParam("TokenScript")) { if (sa.hasParam("TokenScript")) {
sa.setActivatingPlayer(player); sa.setActivatingPlayer(player);
Card protoType = TokenInfo.getProtoType(sa.getParam("TokenScript"), sa, null); for (String token : sa.getParam("TokenScript").split(",")) {
for (String type : protoType.getType().getCreatureTypes()) { Card protoType = TokenInfo.getProtoType(token, sa, null);
Integer count = typesInDeck.get(type); for (String type : protoType.getType().getCreatureTypes()) {
if (count == null) { Integer count = typesInDeck.get(type);
count = 0; if (count == null) {
count = 0;
}
typesInDeck.put(type, count + 1);
} }
typesInDeck.put(type, count + 1);
} }
} }
} }