From d0e1722083b824cd1372a98c362e32762b669650 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sun, 26 May 2002 02:29:13 +0000 Subject: [PATCH] Oh yeah, moveBody() needs to be static. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1394 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/whirled/server/SceneProvider.java | 8 ++++---- .../threerings/whirled/zone/server/ZoneProvider.java | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/java/com/threerings/whirled/server/SceneProvider.java b/src/java/com/threerings/whirled/server/SceneProvider.java index 7f17c4315..ea8a48aff 100644 --- a/src/java/com/threerings/whirled/server/SceneProvider.java +++ b/src/java/com/threerings/whirled/server/SceneProvider.java @@ -1,5 +1,5 @@ // -// $Id: SceneProvider.java,v 1.9 2002/05/26 02:24:46 mdb Exp $ +// $Id: SceneProvider.java,v 1.10 2002/05/26 02:29:13 mdb Exp $ package com.threerings.whirled.server; @@ -108,7 +108,7 @@ public class SceneProvider extends InvocationProvider * request to move to the specified new scene. This is the * scene-equivalent to {@link LocationProvider#moveBody}. */ - public void moveBody (BodyObject source, int sceneId) + public static void moveBody (BodyObject source, int sceneId) { // first remove them from their old place LocationProvider.leaveOccupiedPlace(source); @@ -120,8 +120,8 @@ public class SceneProvider extends InvocationProvider } /** The invocation manager with which we interact. */ - protected InvocationManager _invmgr; + protected static InvocationManager _invmgr; /** The scene registry with which we interact. */ - protected SceneRegistry _screg; + protected static SceneRegistry _screg; } diff --git a/src/java/com/threerings/whirled/zone/server/ZoneProvider.java b/src/java/com/threerings/whirled/zone/server/ZoneProvider.java index 447fcf5dd..189d9b54e 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneProvider.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneProvider.java @@ -1,5 +1,5 @@ // -// $Id: ZoneProvider.java,v 1.8 2002/05/26 02:24:46 mdb Exp $ +// $Id: ZoneProvider.java,v 1.9 2002/05/26 02:29:13 mdb Exp $ package com.threerings.whirled.zone.server; @@ -182,7 +182,7 @@ public class ZoneProvider * request to move to the specified new zone and scene. This is the * zone-equivalent to {@link LocationProvider#moveBody}. */ - public void moveBody (BodyObject source, int zoneId, int sceneId) + public static void moveBody (BodyObject source, int zoneId, int sceneId) { // first remove them from their old place LocationProvider.leaveOccupiedPlace(source); @@ -194,11 +194,11 @@ public class ZoneProvider } /** The invocation manager with which we interact. */ - protected InvocationManager _invmgr; + protected static InvocationManager _invmgr; /** The zone registry with which we communicate. */ - protected ZoneRegistry _zonereg; + protected static ZoneRegistry _zonereg; /** The scene registry with which we communicate. */ - protected SceneRegistry _screg; + protected static SceneRegistry _screg; }