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

fixed a bug with incorrect recognition of numbers written as +N (titanic growth was affected)

Browse Source
This commit is contained in:
Maxmtg
2013-04-03 15:13:31 +00:00
parent e1bc7e1ba0
commit 8586768dcd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/card/ability/AbilityUtils.java
View File

@@ -292,13 +292,15 @@ public class AbilityUtils {
public static int calculateAmount(final Card card, String amount, final SpellAbility ability) { public static int calculateAmount(final Card card, String amount, final SpellAbility ability) {
// return empty strings and constants // return empty strings and constants
if (StringUtils.isBlank(amount)) return 0; if (StringUtils.isBlank(amount)) return 0;
final boolean startsWithPlus = amount.charAt(0) == '+';
if(startsWithPlus) amount = amount.substring(1);
if (StringUtils.isNumeric(amount)) return Integer.parseInt(amount); if (StringUtils.isNumeric(amount)) return Integer.parseInt(amount);
// Strip and save sign for calculations // Strip and save sign for calculations
boolean startsWithPlus = amount.charAt(0) == '+';
boolean startsWithMinus = amount.charAt(0) == '-'; boolean startsWithMinus = amount.charAt(0) == '-';
int multiplier = startsWithMinus ? -1 : 1; int multiplier = startsWithMinus ? -1 : 1;
if(startsWithMinus || startsWithPlus ) if(startsWithPlus )
amount = amount.substring(1); amount = amount.substring(1);
// These are some special cases - who is implementing them? // These are some special cases - who is implementing them?