From b6c3c58ca3b9ce97fd976c1205f486bdb09dadb2 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Mon, 22 Sep 2003 23:42:49 +0000
Subject: [PATCH] Commented out some debug logging that's creating storms of
 strings on the server and added more sanity checking to handleJoinCluster().

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2801 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../whirled/spot/server/SpotSceneManager.java | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
index 7cf905cf6..7dcb4af84 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: SpotSceneManager.java,v 1.43 2003/08/20 21:02:16 mdb Exp $
+// $Id: SpotSceneManager.java,v 1.44 2003/09/22 23:42:49 mdb Exp $
 
 package com.threerings.whirled.spot.server;
 
@@ -171,8 +171,8 @@ public class SpotSceneManager extends SceneManager
             entry = _sscene.getDefaultEntrance();
         }
 
-        Log.debug("Positioning entering body [who=" + body.who() +
-                  ", where=" + entry.getOppLocation() + "].");
+//         Log.debug("Positioning entering body [who=" + body.who() +
+//                   ", where=" + entry.getOppLocation() + "].");
 
         // create a scene location for them located on the entrance portal
         // but facing the opposite direction
@@ -289,8 +289,13 @@ public class SpotSceneManager extends SceneManager
             throw new InvocationException(NO_SUCH_CLUSTER);
         }
 
-        // see if the friend is already in a cluster
+        // make sure we're in the same scene as said user
         BodyObject friend = (BodyObject)tobj;
+        if (friend.location != joiner.location) {
+            throw new InvocationException(NO_SUCH_CLUSTER);
+        }
+
+        // see if the friend is already in a cluster
         clrec = getCluster(friend.getOid());
         if (clrec != null) {
             clrec.addBody(joiner);
@@ -302,8 +307,8 @@ public class SpotSceneManager extends SceneManager
         checkCanCluster(joiner, friend);
 
         // otherwise we create a new cluster and add our charter members!
-        Log.debug("Creating cluster [starter=" + joiner.who() +
-                  ", target=" + friend.who() + "].");
+//         Log.debug("Creating cluster [starter=" + joiner.who() +
+//                   ", target=" + friend.who() + "].");
         clrec = new ClusterRecord();
         clrec.addBody(friend);
         clrec.addBody(joiner);
@@ -426,7 +431,7 @@ public class SpotSceneManager extends SceneManager
 
             // make sure we can add this body
             if (!canAddBody(this, body)) {
-                Log.debug("Cluster full, refusing growth " + this + ".");
+//                 Log.debug("Cluster full, refusing growth " + this + ".");
                 throw new InvocationException(CLUSTER_FULL);
             }
 
@@ -454,7 +459,7 @@ public class SpotSceneManager extends SceneManager
                 _ssobj.commitTransaction();
             }
 
-            Log.debug("Added " + body.who() + " to "+ this + ".");
+//             Log.debug("Added " + body.who() + " to "+ this + ".");
             return true;
         }
 
@@ -487,7 +492,7 @@ public class SpotSceneManager extends SceneManager
                 body.commitTransaction();
             }
 
-            Log.debug("Removed " + bodyOid + " from "+ this + ".");
+//             Log.debug("Removed " + bodyOid + " from "+ this + ".");
 
             // if we've removed our last body; stick a fork in ourselves
             if (size() == 0) {
@@ -550,8 +555,8 @@ public class SpotSceneManager extends SceneManager
 
         protected void destroy ()
         {
-            Log.debug("Cluster empty, going away " +
-                      "[cloid=" + _clobj.getOid() + "].");
+//             Log.debug("Cluster empty, going away " +
+//                       "[cloid=" + _clobj.getOid() + "].");
             _ssobj.removeFromClusters(_cluster.getKey());
             _clusters.remove(_clobj.getOid());
             CrowdServer.omgr.destroyObject(_clobj.getOid());