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

- Fixed a miscalculation and related NPE when trying to predict the bonus from Arahbo, Roar of the World.

Browse Source 
- Some extra NPE prevention measures in related trigger processing code.
This commit is contained in:
Agetian
2017-08-16 12:25:23 +00:00
parent 870b168cea
commit d53f9e99af
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
View File

@@ -1308,6 +1308,10 @@ public class ComputerUtilCombat {
bonus = bonus.replace("TriggerCount$NumBlockers", "Number$1");
} else if (bonus.contains("TriggeredPlayersDefenders$Amount")) { // for Melee
bonus = bonus.replace("TriggeredPlayersDefenders$Amount", "Number$1");
} else if (bonus.contains("TriggeredAttacker$CardPower")) { // e.g. Arahbo, Roar of the World
bonus = bonus.replace("TriggeredAttacker$CardPower", "Number$" + attacker.getNetPower());
} else if (bonus.contains("TriggeredAttacker$CardToughness")) { // e.g. Arahbo, Roar of the World
bonus = bonus.replace("TriggeredAttacker$CardToughness", "Number$" + attacker.getNetToughness());
}
power += CardFactoryUtil.xCount(source, bonus);