From 2afc52d18d0c93db08bc9d136dbd8c4ff99507ba Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 10 Oct 2003 19:18:18 +0000 Subject: [PATCH] Don't freak out if we're missing our scene. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2823 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/whirled/spot/server/SpotSceneManager.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java index 496f2d2c2..0bda486d6 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java +++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java @@ -1,5 +1,5 @@ // -// $Id: SpotSceneManager.java,v 1.45 2003/09/22 23:48:58 mdb Exp $ +// $Id: SpotSceneManager.java,v 1.46 2003/10/10 19:18:18 mdb Exp $ package com.threerings.whirled.spot.server; @@ -51,6 +51,12 @@ public class SpotSceneManager extends SceneManager CrowdServer.plreg.getPlaceManager(body.location); if (mgr != null) { SpotScene scene = (SpotScene)mgr.getScene(); + if (scene == null) { + Log.warning("No scene in moveBodyToDefaultPortal()? " + + "[who=" + body.who() + + ", where=" + mgr.where() + "]."); + return; + } try { Location eloc = scene.getDefaultEntrance().getLocation(); mgr.handleChangeLoc(body, eloc);