From 74bccd4223751282709143273ce145d8c0038d71 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 5 Dec 2008 22:01:25 +0000
Subject: [PATCH] Clean up occupant info creation and whatnot. Now we have a
 nice calldown method bodyWillEnter() where the PlaceManager can do whatever
 they want when the body enters, before or after the occupant info creation
 process.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5579 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../crowd/server/LocationManager.java         |  9 ++--
 .../threerings/crowd/server/PlaceManager.java | 41 +++++--------------
 2 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/src/java/com/threerings/crowd/server/LocationManager.java b/src/java/com/threerings/crowd/server/LocationManager.java
index 37e09e83f..713d47578 100644
--- a/src/java/com/threerings/crowd/server/LocationManager.java
+++ b/src/java/com/threerings/crowd/server/LocationManager.java
@@ -128,15 +128,12 @@ public class LocationManager
                     // remove them from any previous location
                     leaveOccupiedPlace(source);
 
-                    // generate a new occinfo record (which will add it to the target location)
-                    pmgr.buildOccupantInfo(source);
+                    // let the place manager know that we're coming in
+                    pmgr.bodyWillEnter(source);
 
-                    // set the body's new location
+                    // let the body object know that it's going in
                     source.willEnterPlace(place, plobj);
 
-                    // add the body oid to the place object's occupant list
-                    plobj.addToOccupants(bodoid);
-
                 } finally {
                     source.commitTransaction();
                 }
diff --git a/src/java/com/threerings/crowd/server/PlaceManager.java b/src/java/com/threerings/crowd/server/PlaceManager.java
index 24b536190..611fc153c 100644
--- a/src/java/com/threerings/crowd/server/PlaceManager.java
+++ b/src/java/com/threerings/crowd/server/PlaceManager.java
@@ -312,32 +312,21 @@ public class PlaceManager
     }
 
     /**
-     * Builds an {@link OccupantInfo} record for the specified body object and inserts it into our
-     * place object. This is called by the location services when a body enters a place. If a
-     * derived class wishes to perform custom actions when an occupant is being inserted into a
-     * room, they should override {@link #insertOccupantInfo}, if they want to react to a body
-     * having entered, they should override {@link #bodyEntered}.
+     * This is called to inform the manager that a body is on the way in.
      */
-    public OccupantInfo buildOccupantInfo (BodyObject body)
+    public void bodyWillEnter (BodyObject body)
     {
-        try {
-            // create a new occupant info instance
-            OccupantInfo info = body.createOccupantInfo(_plobj);
+        // create a new occupant info instance
+        OccupantInfo info = body.createOccupantInfo(_plobj);
 
-            // insert the occupant info into our canonical table; this is done in a method so that
-            // derived classes
-            insertOccupantInfo(info, body);
+        // insert the occupant info into our canonical table
+        _occInfo.put(info.getBodyOid(), info);
 
-            // clone the canonical copy and insert it into the DSet
-            _plobj.addToOccupantInfo((OccupantInfo)info.clone());
+        // clone the canonical copy and insert it into the DSet
+        _plobj.addToOccupantInfo((OccupantInfo)info.clone());
 
-            return info;
-
-        } catch (Exception e) {
-            log.warning("Failure building occupant info [where=" + where() +
-                        ", body=" + body + "].", e);
-            return null;
-        }
+        // add the body oid to our place object's occupant list
+        _plobj.addToOccupants(body.getOid());
     }
 
     /**
@@ -538,16 +527,6 @@ public class PlaceManager
         cancelShutdowner();
     }
 
-    /**
-     * Called when an occupant is being added to this place. This will be before the call to {@link
-     * #bodyEntered} and gives the derived class a chance to set up additional information about
-     * the occupant that might not be tracked in the occupant info.
-     */
-    protected void insertOccupantInfo (OccupantInfo info, BodyObject body)
-    {
-        _occInfo.put(info.getBodyOid(), info);
-    }
-
     /**
      * Called when a body object enters this place.
      */