From 515b53388b6d1467d70ea243f235a1bf5e8c1d85 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Tue, 15 May 2018 23:10:31 -0700 Subject: [PATCH] Some refactoring --- .../lotro/draft2/builder/StartingPoolBuilder.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 4b9b453ea..03bc88e74 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 @@ -58,7 +58,10 @@ public class StartingPoolBuilder { List shadowRun = (List) shadowRuns.get(rnd.nextInt(shadowRuns.size())); int freePeopleLength = freePeoplesRun.size(); + int freePeopleStart = rnd.nextInt(freePeopleLength); + int shadowLength = shadowRun.size(); + int shadowStart = rnd.nextInt(shadowLength); int runLength; if (freePeopleLength > 0 && shadowLength > 0) { @@ -69,15 +72,12 @@ public class StartingPoolBuilder { runLength = Math.min(runLengthInput, shadowLength); } - int freePeopleStart = rnd.nextInt(freePeopleLength); - int shadowStart = rnd.nextInt(shadowLength); - - Iterable freePeopleIterator = getCyclingIterable(freePeoplesRun, freePeopleStart, runLength); - Iterable shadowIterator = getCyclingIterable(shadowRun, shadowStart, runLength); + Iterable freePeopleIterable = getCyclingIterable(freePeoplesRun, freePeopleStart, runLength); + Iterable shadowIterable = getCyclingIterable(shadowRun, shadowStart, runLength); final DefaultCardCollection startingCollection = new DefaultCardCollection(); - for (String card : Iterables.concat((List) coreCards, freePeopleIterator, shadowIterator)) + for (String card : Iterables.concat((List) coreCards, freePeopleIterable, shadowIterable)) startingCollection.addItem(card, 1); return startingCollection;