From bd40225e95891d8c4d950f4f8680a86c4bdfa384 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Tue, 15 May 2018 23:11:50 -0700 Subject: [PATCH] Some refactoring --- .../lotro/draft2/builder/StartingPoolBuilder.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/builder/StartingPoolBuilder.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/builder/StartingPoolBuilder.java index 03bc88e74..b5ed4694a 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/builder/StartingPoolBuilder.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/builder/StartingPoolBuilder.java @@ -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 freePeopleIterable = getCyclingIterable(freePeoplesRun, freePeopleStart, runLength); Iterable shadowIterable = getCyclingIterable(shadowRun, shadowStart, runLength);