diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index 45b50a0f89c..ab9c2836f6e 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -1986,38 +1986,38 @@ public class CombatUtil { c.setDamage(0); } } - + /** - * gets a string for the GameLog regarding attackers + * gets a string for the GameLog regarding attackers. * * @return a String */ public static String getCombatAttackForLog() { StringBuilder sb = new StringBuilder(); - + // Loop through Defenders // Append Defending Player/Planeswalker final Combat combat = AllZone.getCombat(); final ArrayList defenders = combat.getDefenders(); final CardList[] attackers = combat.sortAttackerByDefender(); - + // Not a big fan of the triple nested loop here for (int def = 0; def < defenders.size(); def++) { if ((attackers[def] == null) || (attackers[def].size() == 0)) { continue; } - + sb.append(combat.getAttackingPlayer()).append(" declared "); for (Card attacker : attackers[def]) { sb.append(attacker).append(" "); } - + sb.append("attacking ").append(defenders.get(def).toString()).append("."); } - + return sb.toString(); } - + /** * gets a string for the GameLog regarding assigned blockers. * @@ -2025,7 +2025,7 @@ public class CombatUtil { */ public static String getCombatBlockForLog() { StringBuilder sb = new StringBuilder(); - + Card[] defend = null; // Loop through Defenders @@ -2033,14 +2033,14 @@ public class CombatUtil { final Combat combat = AllZone.getCombat(); final ArrayList defenders = combat.getDefenders(); final CardList[] attackers = combat.sortAttackerByDefender(); - + // Not a big fan of the triple nested loop here for (int def = 0; def < defenders.size(); def++) { final CardList list = attackers[def]; for (final Card attacker : list) { sb.append(combat.getDefendingPlayer()).append(" assigned "); - + defend = AllZone.getCombat().getBlockers(attacker).toArray(); if (defend.length > 0) { @@ -2051,11 +2051,11 @@ public class CombatUtil { } else { sb.append(" "); } - + sb.append("to block ").append(attacker).append(". "); } // loop through attackers } - + return sb.toString(); } diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index b58837a005b..d0a7c0ce9bf 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -1851,7 +1851,7 @@ public class GameAction { } if (c.hasStartOfKeyword("May be played without paying its mana cost")) { final SpellAbility newSA = sa.copy(); - final Cost cost = new Cost("",c.getName(),false); + final Cost cost = new Cost("", c.getName(), false); for (CostPart part : newSA.getPayCosts().getCostParts()) { if (!(part instanceof CostMana)) { cost.getCostParts().add(part); diff --git a/src/main/java/forge/PhaseUtil.java b/src/main/java/forge/PhaseUtil.java index acbcc2b27e8..5d4139a5e42 100644 --- a/src/main/java/forge/PhaseUtil.java +++ b/src/main/java/forge/PhaseUtil.java @@ -588,7 +588,7 @@ public class PhaseUtil { } } - + AllZone.getGameLog().add("Combat", CombatUtil.getCombatAttackForLog(), 1); final HashMap runParams = new HashMap(); diff --git a/src/main/java/forge/view/match/ViewTabber.java b/src/main/java/forge/view/match/ViewTabber.java index 2fe44dddaf0..0ee4e6ff10c 100644 --- a/src/main/java/forge/view/match/ViewTabber.java +++ b/src/main/java/forge/view/match/ViewTabber.java @@ -303,18 +303,18 @@ public class ViewTabber extends FRoundedPanel { tar.setOpaque(false); tar.setBorder(border); tar.setFont(font); - + tar.setForeground(this.skin.getClrText()); tar.setFocusable(false); tar.setEditable(false); tar.setLineWrap(true); tar.setWrapStyleWord(true); - + JScrollPane jsp = new JScrollPane(tar); jsp.setOpaque(false); jsp.getViewport().setOpaque(false); - + this.pnlConsole.add(jsp, "w 95%!, gapleft 3%, gaptop 1%"); } @@ -657,12 +657,12 @@ public class ViewTabber extends FRoundedPanel { public void mousePressed(final MouseEvent e) { DevLabel.this.setBackground(DevLabel.this.pressedBG); } - + @Override public void mouseReleased(final MouseEvent e) { DevLabel.this.setBackground(DevLabel.this.defaultBG); } - + @Override public void mouseEntered(final MouseEvent e) { DevLabel.this.setBackground(DevLabel.this.hoverBG);