From 38cfdf31ae150577ed82493bffcab60055534ecc Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 5 Dec 2008 22:41:09 +0000
Subject: [PATCH] Do our business in bodyWillEnter() which is more appropriate.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@787 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../whirled/spot/server/SpotSceneManager.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
index 57e4347d..b1a7e9cd 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
@@ -111,6 +111,15 @@ public class SpotSceneManager extends SceneManager
         updateLocation(body, portal.getLocation());
     }
 
+    @Override
+    public void bodyWillEnter (BodyObject body)
+    {
+        super.bodyWillEnter(body);
+
+        // assign this body a starting location in the scene
+        assignStartingLocation(body);
+    }
+
     @Override
     protected void didStartup ()
     {
@@ -160,16 +169,6 @@ public class SpotSceneManager extends SceneManager
         }
     }
 
-    @Override
-    protected void insertOccupantInfo (OccupantInfo info, BodyObject body)
-    {
-        super.insertOccupantInfo(info, body);
-
-        // we don't actually populate their occupant info, but instead assign them their starting
-        // location in the scene
-        assignStartingLocation(body);
-    }
-
     /**
      * Give our new body a starting location.
      */