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

- Fixed possible NPE in getBlockers.

Browse Source
This commit is contained in:
Sloth
2013-06-19 20:59:42 +00:00
parent 8820a45312
commit 13615dc15a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/game/phase/Combat.java
View File

@@ -441,12 +441,12 @@ public class Combat {
} }
public final List<Card> getBlockers(final Card card, boolean ordered) { public final List<Card> getBlockers(final Card card, boolean ordered) {
// If requesting the ordered blocking lsit pass true, directly. // If requesting the ordered blocking list pass true, directly.
List<Card> list = null; List<Card> list = null;
if (ordered) { if (ordered) {
list = this.attackerDamageAssignmentOrder.containsKey(card) ? this.attackerDamageAssignmentOrder.get(card) : null; list = this.attackerDamageAssignmentOrder.containsKey(card) ? this.attackerDamageAssignmentOrder.get(card) : null;
} else { } else {
list = this.getBandByAttacker(card).getBlockers(); list = this.getBandByAttacker(card) != null ? this.getBandByAttacker(card).getBlockers() : null;
} }
if (list == null) { if (list == null) {