Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Refactor: Significant speed-up for ManaOptions (#9233)

Browse source
This commit is contained in:
Alex Vasile 2022-10-04 00:08:20 -04:00 • committed by GitHub
parent 23a4d2640b
commit 55a6acba22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 782 additions and 408 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/main/java/mage/util/CardUtil.java
View file

@ -176,7 +176,7 @@ public final class CardUtil {
}
// ignore unknown mana
if (manaCost.getOptions().size() == 0) {
if (manaCost.getOptions().isEmpty()) {
continue;
}
@ -186,7 +186,7 @@ public final class CardUtil {
}
// generic mana reduce
Mana mana = manaCost.getOptions().get(0);
Mana mana = manaCost.getOptions().getAtIndex(0);
int colorless = mana != null ? mana.getGeneric() : 0;
if (restToReduce != 0 && colorless > 0) {
if ((colorless - restToReduce) > 0) {
@ -219,7 +219,7 @@ public final class CardUtil {
if (manaCost instanceof MonoHybridManaCost) {
// current implemention supports reduce from left to right hybrid cost without cost parts announce
MonoHybridManaCost mono = (MonoHybridManaCost) manaCost;
int colorless = mono.getOptions().get(1).getGeneric();
int colorless = mono.getOptions().getAtIndex(1).getGeneric();
if (restToReduce != 0 && colorless > 0) {
if ((colorless - restToReduce) > 0) {
// partly reduce
@ -254,7 +254,7 @@ public final class CardUtil {
// add to existing cost
if (reduceCount != 0 && manaCost instanceof GenericManaCost) {
GenericManaCost gen = (GenericManaCost) manaCost;
changedCost.put(manaCost, new GenericManaCost(gen.getOptions().get(0).getGeneric() + -reduceCount));
changedCost.put(manaCost, new GenericManaCost(gen.getOptions().getAtIndex(0).getGeneric() + -reduceCount));
reduceCount = 0;
added = true;
} else {
@ -708,9 +708,9 @@ public final class CardUtil {
}
private static int overflowResult(long value) {
if (value > Integer.MAX_VALUE) {
if (value >= Integer.MAX_VALUE) {
return Integer.MAX_VALUE;
} else if (value < Integer.MIN_VALUE) {
} else if (value <= Integer.MIN_VALUE) {
return Integer.MIN_VALUE;
} else {
return (int) value;