From 83f00b6fb59774e1cf10de42ee6bb078ae8f1d4f Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 01:49:36 +0000 Subject: [PATCH] some small tweaks for CardList operations in some Booster draft files --- src/forge/BoosterDraft.java | 4 ++-- src/forge/BoosterDraftAI.java | 2 +- src/forge/BoosterPack.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/forge/BoosterDraft.java b/src/forge/BoosterDraft.java index 803d8798641..56d19809fdd 100644 --- a/src/forge/BoosterDraft.java +++ b/src/forge/BoosterDraft.java @@ -249,8 +249,8 @@ class BoosterDraft_1 implements BoosterDraft if (packNum < packs.size()) { for(int i = 0; i < list.length; i++) - //list[i].addAll(pack.getBoosterPack().toArray()); - list[i].addAll(packs.get(packNum).getBoosterPack().toArray()); + //list[i].addAll(pack.getBoosterPack()); + list[i].addAll(packs.get(packNum).getBoosterPack()); } packNum++; diff --git a/src/forge/BoosterDraftAI.java b/src/forge/BoosterDraftAI.java index 084f2811a6a..48c4e096228 100644 --- a/src/forge/BoosterDraftAI.java +++ b/src/forge/BoosterDraftAI.java @@ -63,7 +63,7 @@ public class BoosterDraftAI { CardList allBooster = new CardList(); for(int i = 0; i < 21; i++) - allBooster.addAll(booster.getBoosterPack().toArray()); + allBooster.addAll(booster.getBoosterPack()); int stop = allBooster.size(); for(int i = 0; i < stop; i++) diff --git a/src/forge/BoosterPack.java b/src/forge/BoosterPack.java index 44aa87de58d..223f79d42eb 100644 --- a/src/forge/BoosterPack.java +++ b/src/forge/BoosterPack.java @@ -7,7 +7,7 @@ public class BoosterPack { CardList all = new CardList(); for(int i = 0; i < number; i++) - all.addAll(getBoosterPack().toArray()); + all.addAll(getBoosterPack()); return all; }