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

Prevent crash potential when updating attacker for view

Browse Source
This commit is contained in:
drdev
2014-10-13 01:34:35 +00:00
parent 7a1313d332
commit 2b2e55a142
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ import forge.card.ColorSet;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.game.Direction; import forge.game.Direction;
import forge.game.GameEntityView; import forge.game.GameEntityView;
import forge.game.combat.Combat;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.player.PlayerView; import forge.game.player.PlayerView;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
@@ -125,14 +126,16 @@ public class CardView extends GameEntityView {
return get(TrackableProperty.Attacking); return get(TrackableProperty.Attacking);
} }
void updateAttacking(Card c) { void updateAttacking(Card c) {
set(TrackableProperty.Attacking, c.getGame().getCombat().isAttacking(c)); Combat combat = c.getGame().getCombat();
set(TrackableProperty.Attacking, combat == null ? false : combat.isAttacking(c));
} }
public boolean isBlocking() { public boolean isBlocking() {
return get(TrackableProperty.Blocking); return get(TrackableProperty.Blocking);
} }
void updateBlocking(Card c) { void updateBlocking(Card c) {
set(TrackableProperty.Blocking, c.getGame().getCombat().isBlocking(c)); Combat combat = c.getGame().getCombat();
set(TrackableProperty.Blocking, combat == null ? false : combat.isBlocking(c));
} }
public boolean isPhasedOut() { public boolean isPhasedOut() {