summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/model/StoneTray.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/jrummikub/model/StoneTray.java')
-rw-r--r--src/jrummikub/model/StoneTray.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/jrummikub/model/StoneTray.java b/src/jrummikub/model/StoneTray.java
index aaedaad..9148934 100644
--- a/src/jrummikub/model/StoneTray.java
+++ b/src/jrummikub/model/StoneTray.java
@@ -189,7 +189,16 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
*/
@Override
public Position getPosition(E object) {
- return objects.get(object).getSecond();
+ Pair<E, Position> entry = objects.get(object);
+ if (entry == null) {
+ return null;
+ }
+ return entry.getSecond();
+ }
+
+ @Override
+ public boolean contains(E object) {
+ return objects.containsKey(objects);
}
@Override