AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting tweaks; moved that new protected method down with its friends.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@594 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Michael Bayne
2008-05-09 11:21:46 +00:00
parent 6e5768b64e
commit 25bacb93f0
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
+23 -25
View File
@@ -59,31 +59,8 @@ public class SpotSceneManager extends SceneManager
{
SpotSceneManager mgr = (SpotSceneManager)
CrowdServer.plreg.getPlaceManager(body.getPlaceOid());
if (mgr == null) {
return;
}
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=" + where() + "].");
return;
}
try {
Location eloc = scene.getDefaultEntrance().getLocation();
handleChangeLoc(body, eloc);
} catch (InvocationException ie) {
Log.warning("Could not move user to default portal [where=" + where() +
", who=" + body.who() + ", error=" + ie + "].");
if (mgr != null) {
mgr.moveToDefaultPortal(body);
}
}
@@ -228,6 +205,27 @@ public class SpotSceneManager extends SceneManager
return new SceneLocation(entry.getOppLocation(), body.getOid());
}
/**
* 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=" + where() + "].");
return;
}
try {
Location eloc = scene.getDefaultEntrance().getLocation();
handleChangeLoc(body, eloc);
} catch (InvocationException ie) {
Log.warning("Could not move user to default portal [where=" + where() +
", who=" + body.who() + ", error=" + ie + "].");
}
}
/**
* Called by the {@link SpotProvider} when we receive a request by a user to occupy a
* particular location.