ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some refactoring

Browse Source
This commit is contained in:
marcin.sciesinski
2018-05-15 23:11:50 -07:00
parent 515b53388b
commit bd40225e95
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/builder/StartingPoolBuilder.java
View File

@@ -45,7 +45,7 @@ public class StartingPoolBuilder {
}
private CardCollectionProducer buildBoosterDraftRun(JSONObject boosterDraftRun) {
final int runLengthInput = ((Number) boosterDraftRun.get("runLength")).intValue();
final int runLength = ((Number) boosterDraftRun.get("runLength")).intValue();
final JSONArray coreCards = (JSONArray) boosterDraftRun.get("coreCards");
final JSONArray freePeoplesRuns = (JSONArray) boosterDraftRun.get("freePeoplesRuns");
final JSONArray shadowRuns = (JSONArray) boosterDraftRun.get("shadowRuns");
@@ -63,15 +63,6 @@ public class StartingPoolBuilder {
int shadowLength = shadowRun.size();
int shadowStart = rnd.nextInt(shadowLength);
int runLength;
if (freePeopleLength > 0 && shadowLength > 0) {
runLength = Math.min(runLengthInput, Math.min(freePeopleLength, shadowLength));
} else if (freePeopleLength > 0) {
runLength = Math.min(runLengthInput, freePeopleLength);
} else {
runLength = Math.min(runLengthInput, shadowLength);
}
Iterable<String> freePeopleIterable = getCyclingIterable(freePeoplesRun, freePeopleStart, runLength);
Iterable<String> shadowIterable = getCyclingIterable(shadowRun, shadowStart, runLength);