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

Pass an object manager to the provider at construct time and use that one

Browse Source 
rather than accessing the one in WhirledServer.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@790 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-12-16 05:38:26 +00:00
parent 769b2e8895
commit c105a3d882
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/whirled/spot/server/SpotProvider.java
+10 -6
View File
@@ -1,8 +1,9 @@
// //
// $Id: SpotProvider.java,v 1.3 2001/12/16 05:15:27 mdb Exp $ // $Id: SpotProvider.java,v 1.4 2001/12/16 05:38:26 mdb Exp $
package com.threerings.whirled.spot.server; package com.threerings.whirled.spot.server;
import com.threerings.presents.dobj.RootDObjectManager;
import com.threerings.presents.server.InvocationManager; import com.threerings.presents.server.InvocationManager;
import com.threerings.presents.server.InvocationProvider; import com.threerings.presents.server.InvocationProvider;
import com.threerings.presents.server.ServiceFailedException; import com.threerings.presents.server.ServiceFailedException;
@@ -15,7 +16,6 @@ import com.threerings.crowd.server.LocationProvider;
import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.server.SceneManager; import com.threerings.whirled.server.SceneManager;
import com.threerings.whirled.server.SceneRegistry; import com.threerings.whirled.server.SceneRegistry;
import com.threerings.whirled.server.WhirledServer;
import com.threerings.whirled.spot.Log; import com.threerings.whirled.spot.Log;
import com.threerings.whirled.spot.client.SpotCodes; import com.threerings.whirled.spot.client.SpotCodes;
@@ -33,10 +33,11 @@ public class SpotProvider extends InvocationProvider
* wishes to make use of the Spot services. * wishes to make use of the Spot services.
*/ */
public static void init ( public static void init (
InvocationManager invmgr, SceneRegistry screg) InvocationManager invmgr, SceneRegistry screg, RootDObjectManager omgr)
{ {
// we'll need this later // we'll need these later
_screg = screg; _screg = screg;
_omgr = omgr;
// register a spot provider instance // register a spot provider instance
invmgr.registerProvider(MODULE_NAME, new SpotProvider()); invmgr.registerProvider(MODULE_NAME, new SpotProvider());
@@ -114,7 +115,7 @@ public class SpotProvider extends InvocationProvider
// make sure the scene they are headed to is actually loaded into // make sure the scene they are headed to is actually loaded into
// the server // the server
WhirledServer.screg.resolveScene(destSceneId, rl); _screg.resolveScene(destSceneId, rl);
} catch (ServiceFailedException sfe) { } catch (ServiceFailedException sfe) {
sendResponse(source, invid, MOVE_FAILED_RESPONSE, sfe.getMessage()); sendResponse(source, invid, MOVE_FAILED_RESPONSE, sfe.getMessage());
@@ -224,7 +225,7 @@ public class SpotProvider extends InvocationProvider
int oldLocId = -1; int oldLocId = -1;
if (placeOid != -1 && locationId != -1) { if (placeOid != -1 && locationId != -1) {
place = (PlaceObject)WhirledServer.omgr.getObject(placeOid); place = (PlaceObject)_omgr.getObject(placeOid);
} }
if (place != null) { if (place != null) {
@@ -248,4 +249,7 @@ public class SpotProvider extends InvocationProvider
/** The scene registry with which we interoperate. */ /** The scene registry with which we interoperate. */
protected static SceneRegistry _screg; protected static SceneRegistry _screg;
/** The object manager we use to do dobject stuff. */
protected static RootDObjectManager _omgr;
} }