From 556347c77814206fcd33ab40de3f3dbce45d9708 Mon Sep 17 00:00:00 2001
From: Walter Korman <shaper@threerings.net>
Date: Sun, 27 Oct 2002 23:30:56 +0000
Subject: [PATCH] Clear things out when the client logs off.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1852 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../crowd/client/OccupantDirector.java        | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/java/com/threerings/crowd/client/OccupantDirector.java b/src/java/com/threerings/crowd/client/OccupantDirector.java
index 7031759af..87f037a91 100644
--- a/src/java/com/threerings/crowd/client/OccupantDirector.java
+++ b/src/java/com/threerings/crowd/client/OccupantDirector.java
@@ -1,5 +1,5 @@
 //
-// $Id: OccupantDirector.java,v 1.5 2002/10/27 21:58:18 shaper Exp $
+// $Id: OccupantDirector.java,v 1.6 2002/10/27 23:30:56 shaper Exp $
 
 package com.threerings.crowd.client;
 
@@ -8,6 +8,8 @@ import java.util.Iterator;
 import com.samskivert.util.HashIntMap;
 import com.samskivert.util.ObserverList;
 
+import com.threerings.presents.client.BasicDirector;
+import com.threerings.presents.client.Client;
 import com.threerings.presents.dobj.EntryAddedEvent;
 import com.threerings.presents.dobj.EntryRemovedEvent;
 import com.threerings.presents.dobj.EntryUpdatedEvent;
@@ -39,7 +41,7 @@ import com.threerings.crowd.util.CrowdContext;
  * can update non-static occupant data rather than permanently using
  * what's in the cache.
  */
-public class OccupantDirector
+public class OccupantDirector extends BasicDirector
     implements LocationObserver, SetListener
 {
     /**
@@ -47,6 +49,8 @@ public class OccupantDirector
      */
     public OccupantDirector (CrowdContext ctx)
     {
+        super(ctx);
+
         // register ourselves as a location observer
         ctx.getLocationDirector().addLocationObserver(this);
     }
@@ -75,10 +79,8 @@ public class OccupantDirector
     public OccupantInfo getOccupantInfo (int bodyOid)
     {
         // make sure we're somewhere
-        if (_place == null) {
-            return null;
-        }
-        return (OccupantInfo)_place.occupantInfo.get(new Integer(bodyOid));
+        return (_place == null) ? null :
+            (OccupantInfo)_place.occupantInfo.get(new Integer(bodyOid));
     }
 
     /**
@@ -103,6 +105,17 @@ public class OccupantDirector
         return null;
     }
 
+    // documentation inherited from interface
+    public void clientDidLogoff (Client client)
+    {
+        // clear things out
+        if (_place != null) {
+            _place.removeListener(this);
+            _place = null;
+        }
+        _ocache.clear();
+    }
+
     // inherit documentation
     public boolean locationMayChange (int placeId)
     {