From 73e514b351e69bf3d71106eed9e38e040b0cd54e Mon Sep 17 00:00:00 2001
From: Par Winzell <zell@threerings.net>
Date: Sun, 5 Dec 2010 03:59:52 +0000
Subject: [PATCH] BodyObject still derives from ClientObject, alas, but that no
 longer means a BodyObject is its own ClientObject. Make sure to send this
 notification to the right object.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1024 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../java/com/threerings/whirled/server/SceneRegistry.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/threerings/whirled/server/SceneRegistry.java b/src/main/java/com/threerings/whirled/server/SceneRegistry.java
index 61be9b03..6c52ca00 100644
--- a/src/main/java/com/threerings/whirled/server/SceneRegistry.java
+++ b/src/main/java/com/threerings/whirled/server/SceneRegistry.java
@@ -203,8 +203,11 @@ public class SceneRegistry
         // first remove them from their old place
         _locman.leaveOccupiedPlace(source);
 
-        // then send a forced move notification
-        SceneSender.forcedMove(source, sceneId);
+        // then send a forced move notification to their client
+        ClientObject clobj = source.getClientObject();
+        if (clobj != null) {
+            SceneSender.forcedMove(source, sceneId);
+        }
     }
 
     /**