AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the bug whereby someone hears a cluster that they've long left.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3073 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2004-08-13 21:46:46 +00:00
parent fb6795fe37
commit 7033108662
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java
+13 -5
View File
@@ -1,5 +1,5 @@
// //
// $Id: SpotSceneDirector.java,v 1.34 2004/03/10 16:20:04 mdb Exp $ // $Id: SpotSceneDirector.java,v 1.35 2004/08/13 21:46:46 ray Exp $
package com.threerings.whirled.spot.client; package com.threerings.whirled.spot.client;
@@ -281,9 +281,17 @@ public class SpotSceneDirector extends BasicDirector
public void objectAvailable (DObject object) public void objectAvailable (DObject object)
{ {
clearCluster(); clearCluster();
_clobj = object; int oid = object.getOid();
if (_chatdir != null) { if (oid != _self.getClusterOid()) {
_chatdir.addAuxiliarySource(object, CLUSTER_CHAT_TYPE); // we got it too late, just unsubscribe
DObjectManager omgr = _ctx.getDObjectManager();
omgr.unsubscribeFromObject(oid, this);
} else {
// it's our new cluster!
_clobj = object;
if (_chatdir != null) {
_chatdir.addAuxiliarySource(object, CLUSTER_CHAT_TYPE);
}
} }
} }
@@ -387,7 +395,7 @@ public class SpotSceneDirector extends BasicDirector
*/ */
protected void clearCluster () protected void clearCluster ()
{ {
if (_clobj != null) { if (_clobj != null && _clobj.getOid() != _self.getClusterOid()) {
if (_chatdir != null) { if (_chatdir != null) {
_chatdir.removeAuxiliarySource(_clobj); _chatdir.removeAuxiliarySource(_clobj);
} }