One day perhaps we'll consider a world where clients can flit between bodies willy nilly and bodies don't necessarily have a client attached to them, but until that day, we're going to require that BodyObject.getClientObject() returns non-null when the body is in the wild.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1026 c613c5cb-e716-0410-b11b-feb51c14d237
2010-12-06 04:43:44 +00:00
parent 1295b1dec7
commit 965237145e
1 changed files with 2 additions and 5 deletions
@@ -203,11 +203,8 @@ public class SceneRegistry
        // first remove them from their old place
        _locman.leaveOccupiedPlace(source);

-        // then send a forced move notification to their client
-        ClientObject clobj = source.getClientObject();
-        if (clobj != null) {
-            SceneSender.forcedMove(clobj, sceneId);
-        }
+        // then send a forced move notification to their client object
+        SceneSender.forcedMove(source.getClientObject(), sceneId);
    }

    /**