AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Send the FORCED_MOVE notification to the client, not the body.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6341 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Par Winzell
2010-12-05 21:12:14 +00:00
parent 817b733ff0
commit 43b915de10
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/crowd/server/LocationManager.java
+6 -3
View File
@@ -166,7 +166,7 @@ public class LocationManager
/** /**
* Forcibly moves the specified body object to the new place. This is accomplished by first * 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). * 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 * 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 * 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 // first remove them from their old place
leaveOccupiedPlace(source); leaveOccupiedPlace(source);
// then send a forced move notification // then send a forced move notification to the body's client
LocationSender.forcedMove(source, place.placeOid); ClientObject clobj = source.getClientObject();
if (clobj != null) {
LocationSender.forcedMove(clobj, place.placeOid);
}
} }
@Inject protected RootDObjectManager _omgr; @Inject protected RootDObjectManager _omgr;