From fbfed05247fb208749e7e9629c4a618fa052fbe8 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 22 Jun 2007 22:01:50 +0000 Subject: [PATCH] One more bit. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@322 c613c5cb-e716-0410-b11b-feb51c14d237 --- .../threerings/whirled/spot/server/SpotSceneManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java index 84d8893d..50bbe605 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java +++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java @@ -206,14 +206,18 @@ public class SpotSceneManager extends SceneManager // create a scene location for them located on the entrance portal but facing the opposite // direction - _ssobj.addToOccupantLocs(computeEnteringLocation(body, entry)); + _ssobj.addToOccupantLocs(computeEnteringLocation(body, from, entry)); } /** * Called when the supplied body is entering our scene via the specified portal. The default * location is the one associated with the portal, but derived classes may wish to adjust this. + * + * @param from the portal the body followed to get to this scene (or null). + * @param entry the portal referenced by the from portal's targetPortalId or the scene's + * default entrance if the from portal did not exist or had no target portal. */ - protected SceneLocation computeEnteringLocation (BodyObject body, Portal entry) + protected SceneLocation computeEnteringLocation (BodyObject body, Portal from, Portal entry) { return new SceneLocation(entry.getOppLocation(), body.getOid()); }