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

Prevent getDefender crash

Browse Source 
Optimize combat logic a bit using FCollection
This commit is contained in:
drdev
2014-10-14 02:42:28 +00:00
parent 86e3d5c9f2
commit 96980a9d30
3 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui-desktop/src/main/java/forge/screens/match/controllers/CCombat.java
View File

@@ -12,6 +12,7 @@ import forge.game.combat.CombatView;
import forge.game.player.PlayerView;
import forge.gui.framework.ICDoc;
import forge.screens.match.views.VCombat;
import forge.util.FCollection;
import forge.util.Lang;
/**
@@ -70,7 +71,7 @@ public enum CCombat implements ICDoc {
private static String getCombatDescription(final CombatView localCombat, final GameEntityView defender) {
final StringBuilder display = new StringBuilder();
Iterable<Iterable<CardView>> bands = localCombat.getAttackingBandsOf(defender);
Iterable<FCollection<CardView>> bands = localCombat.getAttackingBandsOf(defender);
if (bands == null || Iterables.isEmpty(bands)) {
return StringUtils.EMPTY;
}
@@ -86,7 +87,7 @@ public enum CCombat implements ICDoc {
// Associate Bands, Attackers Blockers
boolean previousBand = false;
for (final Iterable<CardView> band : bands) {
for (final FCollection<CardView> band : bands) {
final int bandSize = Iterables.size(band);
if (bandSize == 0) {
continue;
@@ -97,7 +98,7 @@ public enum CCombat implements ICDoc {
display.append("\n");
}
final Iterable<CardView> blockers = localCombat.getBlockers(band);
final FCollection<CardView> blockers = localCombat.getBlockers(band);
final boolean blocked = (blockers != null);
final boolean isBand = bandSize > 1;
if (isBand) {