From de194d53921b33215a6083a53dfb7f4bfed6c864 Mon Sep 17 00:00:00 2001 From: Mike Thomas Date: Sat, 19 Apr 2008 00:23:07 +0000 Subject: [PATCH] Break out the scene manager's method for handling moving to the default portal so that subclasses can override. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@582 c613c5cb-e716-0410-b11b-feb51c14d237 --- .../whirled/spot/server/SpotSceneManager.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java index af62a8ae..31abecf5 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java +++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java @@ -63,18 +63,26 @@ public class SpotSceneManager extends SceneManager return; } - SpotScene scene = (SpotScene)mgr.getScene(); + mgr.moveToDefaultPortal (body); + } + + /** + * Move the specified body to the default portal, if possible. + */ + protected void moveToDefaultPortal (BodyObject body) + { + SpotScene scene = (SpotScene)getScene(); if (scene == null) { Log.warning("No scene in moveBodyToDefaultPortal()? [who=" + body.who() + - ", where=" + mgr.where() + "]."); + ", where=" + where() + "]."); return; } try { Location eloc = scene.getDefaultEntrance().getLocation(); - mgr.handleChangeLoc(body, eloc); + handleChangeLoc(body, eloc); } catch (InvocationException ie) { - Log.warning("Could not move user to default portal [where=" + mgr.where() + + Log.warning("Could not move user to default portal [where=" + where() + ", who=" + body.who() + ", error=" + ie + "]."); } }