Log a message when we drop a forced move request due to a pending move.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4831 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/crowd/client/LocationDirector.java

@@ -438,18 +438,23 @@ public class LocationDirector extends BasicDirector
     }
 
     // documentation inherited from interface
-    public void forcedMove (final int placeId)
+    public void forcedMove (int placeId)
     {
-        Log.info("Moving at request of server [placeId=" + placeId + "].");
+        // if we're in the middle of a move, we can't abort it or we will screw everything up, so
-
+        // just finish up what we're doing and assume that the repeated move request was the
-        if (!movePending()) {
+        // spurious one as it would be in the case of lag causing rapid-fire repeat requests
-            // clear out our old place information
+        if (movePending()) {
-            mayLeavePlace();
+            Log.info("Dropping forced move because we have a move pending " +
-            didLeavePlace();
+                     "[pendId=" + _pendingPlaceId + ", reqId=" + placeId + "].");
-
+            return;
-            // move to the new place
-            moveTo(placeId);
         }
+
+        Log.info("Moving at request of server [placeId=" + placeId + "].");
+        // clear out our old place information
+        mayLeavePlace();
+        didLeavePlace();
+        // move to the new place
+        moveTo(placeId);
     }
 
     /**