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

- Fixed ChooseSourceEffect from crashing when selecting fake cards.

Browse Source
This commit is contained in:
Sloth
2015-03-11 14:19:06 +00:00
parent 5369091f8a
commit 87db02f77b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-game/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java
View File

@@ -106,24 +106,24 @@ public class ChooseSourceEffect extends SpellAbilityEffect {
Card divCommandZoneSources = new Card(-4, game); Card divCommandZoneSources = new Card(-4, game);
divCommandZoneSources.setName("--CARDS IN THE COMMAND ZONE:--"); divCommandZoneSources.setName("--CARDS IN THE COMMAND ZONE:--");
if (permanentSources.size() > 0) { if (!permanentSources.isEmpty()) {
sourcesToChooseFrom.add(divPermanentSources); sourcesToChooseFrom.add(divPermanentSources);
sourcesToChooseFrom.addAll(permanentSources); sourcesToChooseFrom.addAll(permanentSources);
} }
if (stackSources.size() > 0) { if (!stackSources.isEmpty()) {
sourcesToChooseFrom.add(divStackSources); sourcesToChooseFrom.add(divStackSources);
sourcesToChooseFrom.addAll(stackSources); sourcesToChooseFrom.addAll(stackSources);
} }
if (referencedSources.size() > 0) { if (!referencedSources.isEmpty()) {
sourcesToChooseFrom.add(divReferencedSources); sourcesToChooseFrom.add(divReferencedSources);
sourcesToChooseFrom.addAll(referencedSources); sourcesToChooseFrom.addAll(referencedSources);
} }
if (commandZoneSources.size() > 0) { if (!commandZoneSources.isEmpty()) {
sourcesToChooseFrom.add(divCommandZoneSources); sourcesToChooseFrom.add(divCommandZoneSources);
sourcesToChooseFrom.addAll(commandZoneSources); sourcesToChooseFrom.addAll(commandZoneSources);
} }
if (sourcesToChooseFrom.size() == 0) { if (sourcesToChooseFrom.isEmpty()) {
return; return;
} }
@@ -138,7 +138,7 @@ public class ChooseSourceEffect extends SpellAbilityEffect {
Card o = null; Card o = null;
do { do {
o = p.getController().chooseSingleEntityForEffect(sourcesToChooseFrom, sa, choiceTitle); o = p.getController().chooseSingleEntityForEffect(sourcesToChooseFrom, sa, choiceTitle);
} while (o.equals(divPermanentSources) || o.equals(divStackSources) || o.equals(divReferencedSources) || o.equals(divCommandZoneSources)); } while (o == null);
chosen.add(o); chosen.add(o);
sourcesToChooseFrom.remove(o); sourcesToChooseFrom.remove(o);
} }