From e37862758d66e4d4caa259e3b27ca4db04f7ce10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Tue, 28 Oct 2014 17:22:17 +0100
Subject: TileSet,Hex: do not crash callint iterator().next() when empty

---
 core/src/ch/asynk/tankontank/engine/TileSet.java | 1 +
 core/src/ch/asynk/tankontank/game/Hex.java       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/src/ch/asynk/tankontank/engine/TileSet.java b/core/src/ch/asynk/tankontank/engine/TileSet.java
index 07dc8ad..5a75b5d 100644
--- a/core/src/ch/asynk/tankontank/engine/TileSet.java
+++ b/core/src/ch/asynk/tankontank/engine/TileSet.java
@@ -18,6 +18,7 @@ public class TileSet extends LinkedHashSet<Tile> implements Board.TileCollection
 
     public Tile first()
     {
+        if (isEmpty()) return null;
         return iterator().next();
     }
 
diff --git a/core/src/ch/asynk/tankontank/game/Hex.java b/core/src/ch/asynk/tankontank/game/Hex.java
index 77b8bfd..b357e56 100644
--- a/core/src/ch/asynk/tankontank/game/Hex.java
+++ b/core/src/ch/asynk/tankontank/game/Hex.java
@@ -47,6 +47,7 @@ public class Hex extends Tile
 
     public Unit getUnit()
     {
+        if (isEmpty()) return null;
         return (Unit) iterator().next();
     }
 
-- 
cgit v1.1-2-g2b99