From d44557eadd9cb96e9b8ba486212c9dffecbc56ea Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 14 Feb 2003 21:34:26 +0000 Subject: [PATCH] Minor adjustment to cluster handling. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2281 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/whirled/spot/server/SpotSceneManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java index 039de5e3a..f9fbab65b 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.26 2003/02/13 21:55:22 mdb Exp $ +// $Id: SpotSceneManager.java,v 1.27 2003/02/14 21:34:26 mdb Exp $ package com.threerings.whirled.spot.server; @@ -189,10 +189,12 @@ public class SpotSceneManager extends SceneManager _ssobj.updateOccupantLocs(sloc); } - // handle the cluster situation + // handle the cluster situation; -1 means remove, our own oid + // means leave us in whatever cluster we're already in; someone + // else's oid means join their cluster or start one with them if (cluster == -1) { removeFromCluster(source.getOid()); - } else { + } else if (cluster != source.getOid()) { createOrJoinCluster(cluster, source); } }