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

Clean up

Browse Source
This commit is contained in:
tool4EvEr
2021-10-08 21:35:50 +02:00
parent 9f7012f718
commit 04c1b2664f
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-ai/src/main/java/forge/ai/ability/SetStateAi.java
View File

@@ -210,7 +210,6 @@ public class SetStateAi extends SpellAbilityAi {
// if an opponent can't block it, no need to transform (back) // if an opponent can't block it, no need to transform (back)
for (Player opp : ai.getOpponents()) { for (Player opp : ai.getOpponents()) {
boolean attackCard = !ComputerUtilCard.canBeBlockedProfitably(opp, original); boolean attackCard = !ComputerUtilCard.canBeBlockedProfitably(opp, original);
boolean attackTransformed = !ComputerUtilCard.canBeBlockedProfitably(opp, copy); boolean attackTransformed = !ComputerUtilCard.canBeBlockedProfitably(opp, copy);

6
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -408,9 +408,8 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
CardCloneStates clStates = getLastClonedState(); CardCloneStates clStates = getLastClonedState();
if (clStates == null) { if (clStates == null) {
return getOriginalState(state); return getOriginalState(state);
} else {
return clStates.get(state);
} }
return clStates.get(state);
} }
public boolean hasState(final CardStateName state) { public boolean hasState(final CardStateName state) {
@@ -420,9 +419,8 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
CardCloneStates clStates = getLastClonedState(); CardCloneStates clStates = getLastClonedState();
if (clStates == null) { if (clStates == null) {
return states.containsKey(state); return states.containsKey(state);
} else {
return clStates.containsKey(state);
} }
return clStates.containsKey(state);
} }
public CardState getOriginalState(final CardStateName state) { public CardState getOriginalState(final CardStateName state) {