Ask the SceneProvider to handle a moveBody request if the body is already

in the correct zone.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3064 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/whirled/zone/server/ZoneProvider.java

@@ -1,5 +1,5 @@
 //
-// $Id: ZoneProvider.java,v 1.16 2003/10/25 00:10:35 mdb Exp $
+// $Id: ZoneProvider.java,v 1.17 2004/07/30 21:13:41 ray Exp $
 
 package com.threerings.whirled.zone.server;
 
@@ -202,11 +202,17 @@ public class ZoneProvider
      */
     public void moveBody (ZonedBodyObject source, int zoneId, int sceneId)
     {
-        // first remove them from their old location
+        if (source.getZoneId() == zoneId) {
-        leaveOccupiedZone(source);
+            // handle the case of moving somewhere in the same zone
+            _screg.sceneprov.moveBody((BodyObject) source, sceneId);
 
-        // then send a forced move notification
+        } else {
-        ZoneSender.forcedMove((BodyObject)source, zoneId, sceneId);
+            // first remove them from their old location
+            leaveOccupiedZone(source);
+
+            // then send a forced move notification
+            ZoneSender.forcedMove((BodyObject)source, zoneId, sceneId);
+        }
     }
 
     /**