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

Clean up

Browse Source
This commit is contained in:
tool4EvEr
2022-04-22 17:08:02 +02:00
parent c314467cbd
commit c932a04204
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
View File

@@ -35,7 +35,7 @@ public class DiscardEffect extends SpellAbilityEffect {
final String mode = sa.getParam("Mode");
final StringBuilder sb = new StringBuilder();
final Iterable<Player> tgtPlayers = Iterables.filter(getTargetPlayers(sa), PlayerPredicates.canDiscardBy(sa, true));
final Iterable<Player> tgtPlayers = getTargetPlayers(sa).filter(PlayerPredicates.canDiscardBy(sa, true));
if (!Iterables.isEmpty(tgtPlayers)) {
sb.append(Lang.joinHomogenous(tgtPlayers)).append(" ");

2
forge-game/src/main/java/forge/game/card/CardUtil.java
View File

@@ -315,7 +315,7 @@ public final class CardUtil {
newCopy.setExiledWith(getLKICopy(in.getExiledWith(), cachedMap));
if (in.getGame().getCombat() != null) {
if (in.getGame().getCombat() != null && in.isPermanent()) {
newCopy.setCombatLKI(in.getGame().getCombat().saveLKI(newCopy));
}

6
forge-game/src/main/java/forge/game/combat/Combat.java
View File

@@ -300,7 +300,7 @@ public class Combat {
return ab;
}
}
CombatLki lki = lkiCache.get(c) != null ? lkiCache.get(c).getCombatLKI() : null;
CombatLki lki = lkiCache.get(c).getCombatLKI();
return lki == null || !lki.isAttacker ? null : lki.getFirstBand();
}
@@ -958,7 +958,7 @@ public class Combat {
return false;
}
CombatLki lki = lkiCache.get(blocker) != null ? lkiCache.get(blocker).getCombatLKI() : null;
CombatLki lki = lkiCache.get(blocker).getCombatLKI();
return null != lki && !lki.isAttacker; // was blocking something anyway
}
@@ -973,7 +973,7 @@ public class Combat {
return false;
}
CombatLki lki = lkiCache.get(blocker) != null ? lkiCache.get(blocker).getCombatLKI() : null;
CombatLki lki = lkiCache.get(blocker).getCombatLKI();
return null != lki && !lki.isAttacker && lki.relatedBands.contains(ab); // was blocking that very band
}