From 1f9cf2beca1684543458fa130579574f7f0faa65 Mon Sep 17 00:00:00 2001
From: Mike Thomas <mthomas@threerings.net>
Date: Fri, 11 Jun 2010 18:00:09 +0000
Subject: [PATCH] Don't NPE when we have a missing color class in the list,
 instead, return -1 to emulate the old IntIntMap behavior.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@926 c613c5cb-e716-0410-b11b-feb51c14d237
---
 src/java/com/threerings/stage/data/StageSceneModel.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/java/com/threerings/stage/data/StageSceneModel.java b/src/java/com/threerings/stage/data/StageSceneModel.java
index 8ec134e6..d55a7a05 100644
--- a/src/java/com/threerings/stage/data/StageSceneModel.java
+++ b/src/java/com/threerings/stage/data/StageSceneModel.java
@@ -53,7 +53,10 @@ public class StageSceneModel extends SceneModel
     public int getDefaultColor (int classId)
     {
         if (defaultColors != null) {
-            return defaultColors.get(classId);
+            Integer result = defaultColors.get(classId);
+            if (result != null) {
+                return result;
+            }
         }
         return -1;
     }