From 43b915de100ee9b1db3f942ccb8c7e9d5a84b990 Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Sun, 5 Dec 2010 21:12:14 +0000 Subject: [PATCH] Send the FORCED_MOVE notification to the client, not the body. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6341 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/crowd/server/LocationManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/threerings/crowd/server/LocationManager.java b/src/main/java/com/threerings/crowd/server/LocationManager.java index 9b726f2bd..67fdc8dc5 100644 --- a/src/main/java/com/threerings/crowd/server/LocationManager.java +++ b/src/main/java/com/threerings/crowd/server/LocationManager.java @@ -166,7 +166,7 @@ public class LocationManager /** * Forcibly moves the specified body object to the new place. This is accomplished by first - * removing the client from their old location and then sending the client a notification, + * removing the body from their old location and then sending the client a notification, * instructing it to move to the new location (which it does using the normal moveTo service). * This has the benefit that the client is removed from their old place regardless of whether * or not they are cooperating. If they choose to ignore the forced move request, they will @@ -177,8 +177,11 @@ public class LocationManager // first remove them from their old place leaveOccupiedPlace(source); - // then send a forced move notification - LocationSender.forcedMove(source, place.placeOid); + // then send a forced move notification to the body's client + ClientObject clobj = source.getClientObject(); + if (clobj != null) { + LocationSender.forcedMove(clobj, place.placeOid); + } } @Inject protected RootDObjectManager _omgr;