From 965237145ecfc777e4808d299b615e34f9b31f36 Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Mon, 6 Dec 2010 04:43:44 +0000 Subject: [PATCH] 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 --- .../java/com/threerings/whirled/server/SceneRegistry.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/threerings/whirled/server/SceneRegistry.java b/src/main/java/com/threerings/whirled/server/SceneRegistry.java index 57b13c74..9a7d6397 100644 --- a/src/main/java/com/threerings/whirled/server/SceneRegistry.java +++ b/src/main/java/com/threerings/whirled/server/SceneRegistry.java @@ -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); } /**