diff options
Diffstat (limited to 'src/jrummikub/model/StoneHeap.java')
| -rw-r--r-- | src/jrummikub/model/StoneHeap.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/jrummikub/model/StoneHeap.java b/src/jrummikub/model/StoneHeap.java index c013570..048f6e7 100644 --- a/src/jrummikub/model/StoneHeap.java +++ b/src/jrummikub/model/StoneHeap.java @@ -36,6 +36,9 @@ public class StoneHeap { * @return the drawn stone */ public Stone drawStone() { + if (heap.isEmpty()) { + return null; + } return heap.remove(generator.nextInt(heap.size())); } @@ -48,6 +51,7 @@ public class StoneHeap { */ public List<Stone> drawStones(int number) { List<Stone> drawnStones = new ArrayList<Stone>(); + number = Math.min(number, heap.size()); for (int i = 0; i < number; i++) { drawnStones.add(drawStone()); } |