external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug that prevented the combat log from showing the most recently declared attacker.

Browse Source
This commit is contained in:
Krazy
2015-09-11 20:41:15 +00:00
parent 91f0d428eb
commit 82dd141ec2
2 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,6 +562,7 @@ public class Card extends GameEntity implements Comparable<Card> {
public void updateAttackingForView() {
view.updateAttacking(this);
getGame().updateCombatForView();
}
public void updateBlockingForView() {
view.updateBlocking(this);

26
forge-game/src/main/java/forge/game/card/CardView.java
View File

@@ -1,23 +1,9 @@
package forge.game.card;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import forge.ImageKeys;
import forge.card.CardEdition;
import forge.card.CardRarity;
import forge.card.CardRules;
import forge.card.CardStateName;
import forge.card.CardType;
import forge.card.CardTypeView;
import forge.card.ColorSet;
import forge.card.*;
import forge.card.mana.ManaCost;
import forge.game.Direction;
import forge.game.GameEntityView;
@@ -31,6 +17,12 @@ import forge.trackable.TrackableObject;
import forge.trackable.TrackableProperty;
import forge.trackable.Tracker;
import forge.util.collect.FCollectionView;
import org.apache.commons.lang3.StringUtils;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class CardView extends GameEntityView {
private static final long serialVersionUID = -3624090829028979255L;
@@ -144,7 +136,7 @@ public class CardView extends GameEntityView {
}
void updateAttacking(Card c) {
Combat combat = c.getGame().getCombat();
set(TrackableProperty.Attacking, combat == null ? false : combat.isAttacking(c));
set(TrackableProperty.Attacking, combat != null && combat.isAttacking(c));
}
public boolean isBlocking() {
@@ -152,7 +144,7 @@ public class CardView extends GameEntityView {
}
void updateBlocking(Card c) {
Combat combat = c.getGame().getCombat();
set(TrackableProperty.Blocking, combat == null ? false : combat.isBlocking(c));
set(TrackableProperty.Blocking, combat != null && combat.isBlocking(c));
}
public boolean isPhasedOut() {